Jeno's changes 12-17-2014
Merge branch 'Marlin_v1' of https://github.com/jeno007/Marlin into Marlin_v1