Merge branch 'trip' of github.com:timproctor/footprints into timproctor-trip
cleaning up indentation on trip_spec
adds validator for user_id & test
Tidies up trip_spec and test user/test relationship in user_spec
Merge branch 'polishing-trip'
step one.
fixes merge conflict in schema
fixes broken trips_controller test
tiny tweaks to trip_new view
Merge pull request #42 from MarcGarreau/trip-crud

Trip crud