Merge upstream

.gitignore

@@ -1,3 +1,12 @@
+// Our automatic versioning scheme generates the following file
+// NEVER put it in the repository
+_Version.h
+
+// All of the following OS, IDE and compiler generated file
+// references should be moved from this file
+// They are needed, but they belong in your global .gitignore
+// rather than in a per-project file such as this
+
 *.o
 applet/
 *~

.travis.yml

@@ -13,6 +13,8 @@ install:
   - sudo apt-get update -q 
   - sudo apt-get install arduino
 before_script:
+  # copy TMC and L6470 libraries to arduino dir, as conditional includes do not work in .ino files
+  - sudo cp -r ArduinoAddons/Arduino_1.x.x/libraries/ /usr/share/arduino
  # add U8glib, LiquidCrystal_I2C & LiquidTWI2 libraries 
   - sudo unzip u8glib_arduino_v1.17.zip -d /usr/share/arduino/libraries/
   - cd /usr/share/arduino/libraries/
@@ -138,8 +140,12 @@ script:
   - rm -rf .build/
   - ino build -m mega2560
   ######## Example Configurations ##############
-  # Delta Config
-  - cp Marlin/example_configurations/delta/Configuration* Marlin/
+  # Delta Config (generic)
+  - cp Marlin/example_configurations/delta/generic/Configuration* Marlin/
+  - rm -rf .build/
+  - ino build -m mega2560
+  # Delta Config (Mini Kossel)
+  - cp Marlin/example_configurations/delta/kossel_mini/Configuration* Marlin/
   - rm -rf .build/
   - ino build -m mega2560
   # Makibox Config  need to check board type for Teensy++ 2.0

ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/boards.txt

@@ -33,7 +33,7 @@ rambo.build.variant=rambo
 ########################################
 sanguino.name=Sanguino
 
-sanguino.upload.tool=ardunio:avrdude
+sanguino.upload.tool=arduino:avrdude
 sanguino.upload.protocol=stk500
 sanguino.upload.maximum_size=131072
 sanguino.upload.speed=57600

ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt

@@ -0,0 +1 @@
+compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING