Switch sqlite to pg
Update database config for pg
Merge branch 'pgsql' into develop
Merge branch 'develop' into cleanup

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
Update gemfile.lock