Merge pull request #1 from synthetos/alden

Update omco/g2:alden
Merge branch 'alden' of https://github.com/synthetos/g2 into alden
Add settings_othermill.h to xcode project, update settings for ARM board
Fix heartbeat LED pin number (was erroneously set to M1 Vref pin)
Fix canonical_machine enum print strings
Merge remote-tracking branch 'upstream/alden' into alden
Add JLink configuration to .gdbinit
Merge branch 'omc' into alden

Conflicts:
	TinyG2/TinyG2.xcodeproj/project.pbxproj
settings_othermill.h update
Add jogging callback to the top level state machine
Rewrite jogging cycle to fit with cycle design guidelines
Merge pull request #6 from omco/alden

Fix for canonical machine enum strings, settings_othermill