Add pg for production only
Add werckr.yml
Merge branch 'master' of github.com:zephiransas/wercker-trial

Conflicts:
	Gemfile