clean up roles and users and a join table
make some of the nav active
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
Merge pull request #20 from electricpineapple/master

Roles UserRoles