automatic location detection added for even more awesomeness
refactored a bit, merged in new changes
Merge pull request #31 from web-mech/master

Auto-Location Cleanup (Closes #14)