Merge pull request #55 from kevb0001/umass_branch

more associations
fixed up the migrations files and edited the migration of default and nils to inlcude everything it should
Merge remote-tracking branch 'origin' into umass_branch
fixing conflict in schema.rb
Conflicts:
	db/schema.rb
	log/development.log
forgot log had a conflict, removed conflict by removing all the entries in the log
spelling error in users.rb corrected and corrected the inputs for a db/seed so a default locations is created
Capistrano file

needed for one step build
Corrected attributes accessible in the models adding missing ones and correcting typos
Merge branch 'umass_branch' of https://github.com/jjliang/databaseui into umass_branch
minor changes for now
removed database.yml
added database.yml to gitignore and removing a wild card
added migration to add columns to functional groups
added support for project lead with minor bugs
changes made for staging server
adding changes to deploy
adding changes to deploy
'nothing'
'logchange'
'little_things'