WIP
Merge branch 'nb/features/user_model_fields' into nb/features/active-admin

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'develop' of github.com:devs-for-change/main-site into nb/features/active-admin
Configuring ActiveAdmin
rdoc fixup
ActiveAdmin in place for editing basic user info
Merge pull request #22 from devs-for-change/nb/features/active-admin

AA In place, not wired up with paperclip yet.