Defective something

Slow as shit...checking gcode
Added my changes to Configuration.h
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde