migrated most recent upstream pull
started messing around with abilities
added get_org_ids and get_prog_ids to user
Merge pull request #44 from jschiang/master

messed around with some abilities and added methods to user