getLocation timeout fix
Merge pull request #34 from jakecadams/locationfix

getLocation timeout fix