Merge pull request #28 from lolanysf/master

Icon.scss files revised to variables, removed bad icon mixin, updated manifest styles.scss
tweak styling, add markers to google map
merge upstream
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
refactor api unit tests and confirm no upsert bug
Merge pull request #31 from GabeMedrash/master

refactor api unit tests and confirm no upsert bug
add user profile html and corresponding styles
Merge pull request #32 from DrivewayHunt/loann-dev

add user profile html and corresponding styles