Merge branch 'development'
Adds pg gem back again
Removes gemfile.lock
Adds puma and trinidad gem
Merge branch 'master' into development
Updates tweet stream to use tweet4jr