Merge pull request #23 from th7/gmap_locator

Gmap locator
Merge pull request #24 from th7/css_edits

Css edits
Merge pull request #25 from th7/bugfix

Bugfix
update specs, remove unused code
resolve conflict
Merge branch 'bugfix' into rspec