production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
remove turbolinks

Signed-off-by: Alex Falke <afalkear@gmail.com>
updated gemfile.lock
pg for heroku