Merge pull request #29 from JakeRawr/master

tweak styling, add markers to google map
small tweaks to api and tests to try to track down unwanted upsert
merge upstream
again remove compiled sass partials and update .gitignore
Merge pull request #30 from GabeMedrash/master

update gitignore and working tree to prevent future merge conflicts
fix sale select row to a title link