GPS fixes, change names in Settings
Merge pull request #38 from jwisch91/master

GPS Fix.