Merge pull request #1 from triathlonboy/master

A user can create a trip with a start and end date
can create a place
draft
users can see places they are visiting on a map
deletion of a few files
merges with map draft
passed data to map from controller
can take multiple places from db and show on map
adding a trip, viewing trips
Merge pull request #2 from triathlonboy/master

User can add place including Google API autocomplete
map bounds adjusted to places on map
merged to master branch
map fixed
Pre merge commit
Merge remote-tracking branch 'Vince/fixing_css' into merge_map

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/CE5/650/sprockets%2F8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/D91/080/sprockets%2Fbcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/D9F/300/sprockets%2Fc13fc73ceafa45876a901b3e775b83ae
tidied up the layouts html erb files
Integration with maps
updated routes.rb
merged with matt