Lots of stuff. some of which may e unecessary. The most necessary is the adding of the geodata type columns to the location table
First save after merging in Sams latest changes. Changes made to fix merge conflicts. Also change CSS and application.html.erb so that the search box is right aligned and the top bar displays more neatly
Merge pull request #4 from jameshume/master

Local changes plus merge conflict fixes and title bar fix to float the search box to the right