Changed some abilities
Merge remote-tracking branch 'upstream/master'
merged most recent upstream + added some abilites
added more abilities
Merge remote-tracking branch 'upstream/master'
migrated db with individual_id in user
Merge pull request #51 from jschiang/master

Added more ability/user model stuff