Delta disabled by default
Allow command line compilation when using BEEPER.
Fix location of avrdude.conf
Merge pull request #520 from henrikbrixandersen/Makefile-fixes

Makefile fixes
added Azteeg X1 motherboard
Merge pull request #521 from lajos/azteeg_x1

added Azteeg X1 motherboard
fixed compile error in ultralcd.cpp when PIDTEMP undefined
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
Merge pull request #525 from lajos/ultralcd_pid

ultralcd.cpp compile errors when !defined(PIDTEMP)
Fix Pin Description Typo

Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
Merge pull request #526 from ch100/Marlin_v1

Fix Pin Description Typo
Added DISABLE_MIN_ENDSTOPS
Added thermistor 60 to configuration.h
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
Merge pull request #532 from codexmas/ServoEndstops

Fix for ugly code compilation errors in SERVO_ENDSTOP checks
Should fix compiler warning for feedrate deadzone
Merge pull request #534 from xifle/Marlin_v1

Fixes compiler warning for feedrate deadzone
merged with upstream