Merge branch 'release/0.4.0.0'
switch Gemfile.lock to pg exclusivly
Grrr just use postgres dammit
Merge branch 'heroku' into develop