bundle updated
installing postgres
adding newline
new schema.rb
Merge branch 'master' into alli/postgresql

Conflicts:
	Gemfile.lock
Merge pull request #20 from calblueprint/alli/postgresql

Alli/postgresql