Merge pull request #1 from jameshume/master

Deleting old db migrations, no longer needed, that were causing migrate ...
Merge pull request #2 from jameshume/master

First pass of Javascript for facebook and google login...
commit my irrelevant file but not the .idea
commit stuff
commit james' stuff
Merge pull request #3 from jameshume/master

Further work on the login stuff and also using current_user in the trip ...
partially updated jquery modal form add photo
Merge branch 'master' of https://github.com/sp0ngey/travelapp1
trip item modal form ajax

more updates...
taken _modal form out

i shouldnt have puta partial within a partial
ajax form add trip ID

works but only for one photo search. If more photos it doesn't work
latest update
Masking some changes to add trip so that the individual trip id is used and not the last trip item... removing reliance on window.photoID