switch Gemfile.lock to pg exclusivly
added self as admin
stuff
del
Merge branch 'master' of heroku.com:diaspora-citrrus into develop

Conflicts:
	Gemfile.lock
updating gems