Merging Jetty and Dan's r16 updates
gcode cals
updated gitignore
updating gcode for thingomatic
Merge branch 'merge-jetty'