Merge pull request #37 from jwisch91/master

Brian and I get shit done
GPS fixes, change names in Settings