Added and changed map javascript:

- Added new InfoBox.js file for easy googlemaps info boxes
- Added new click functions to:  updated marker placement with info boxes
- Added zoom listener so map does not Zoom in too much when marker/waypoint places
- Added reference to InfoBox.js to layout page
Merge branch 'features/views_map' of https://github.com/spring-peepers-2014/TravelBlog
Update Travis CI hook to reference new database yml
Resolve merge conflict due to pull vs rebase

Conflict due to pull after branch merge
No changes, conflict in commented vs uncommented block