Merge pull request #171 from gitMbar/dev

Refactor map feed to conform to Angular best practices
Small refactor of navbar and cleanup
Refactor map.js to follow Angular best practices
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev