migrated most recent upstream pull
started messing around with abilities
added get_org_ids and get_prog_ids to user
Nav_bar now appears on every page.
On nav_bar: 1. Added a clickable contact tab 2. Clicking Gelfand Center takes u Home
Merge pull request #45 from psethu/master

More changes to Nav-bar
Merge pull request #44 from jschiang/master

messed around with some abilities and added methods to user
fixed merge conflicts.