fixed relationship syntax error and ran rake db:migrate
Merge github.com:nbhartiya/MVP
small fixes and hooking up