Updated example configurations for Delta printers
Merge pull request #1133 from monkeydave/update_delta_config

Updated example configurations for Delta printers
Merge pull request #2 from ErikZalm/Marlin_v1

Sync up to Marlin
Commented out FILAMENT_SENSOR #define

Commented out the FILAMENT_SENSOR define so that it is not enabled by
default.  Code does not work on all hardware variants.
Merge pull request #1138 from filipmu/Marlin_v1

Comment out the FILAMENT_SENSOR define by default in config.
Adaption of LCD info screen

Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
Merge pull request #1143 from Silly105/Marlin_v1

Changed graphic LCD info screen to match the set # of extruders
Add Travis CI config to build Marlin firmware.
Merge pull request #1148 from krasin/travis

Add Travis CI config to build Marlin firmware.
SD Card Alpha Sorting

First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
M0-M1 Enhancements

Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
Relocate click ignore code into info screen
Clear LCD to welcome_msg if not printing

The welcome message is more appropriate than “resuming print” if
nothing is printing.
Expand on More RAM concept, address minor bugs
Improvements, more SORT_USES_MORE_RAM

With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
Completed SORT_USES_MORE_RAM implementation

For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
Ignore S and P if no value >0 is included.
get latest Marlin_v1 changes
M0-M1 Enhancements

Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
Relocate click ignore code into info screen