commented out spec in the helper_spec files because we're not using it
fixed tests
gemfile
fixed merge conflicts
changed the test for use current location button, because the text of the button was changed
Merge pull request #80 from bobolinks-2014/fixing-conflicts

Fixing conflicts