Worked on making GPS work...
Merge branch 'master' into bradley