make finding locations work
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from davidascher/master

make finding locations work (button hiding/showing not working yet, not sure why)