Added .ruby-version
Updated Rails and other gems
Updated Devise - reset password tokens invalidated

Devise updated. Previous reset password tokens in the database do not
work after this change. If resetting passwords is enabled it is
recommended to enable the unsafe method in production for a day or so
that reset emails already sent out work. See
http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/
for more information.
Upgrade Paperclip to latest of 2.x

There are still some unsolved issues with upgrading to 3.x series.
Updated Rails and other gems - reset password tokens invalidated

Devise updated. Previous reset password tokens in the database do not
work after this change. If resetting passwords is enabled it is
recommended to enable the unsafe method in production for a day or so
that reset emails already sent out work. See
http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/
for more information.
Vagrant setup for testing production environment

Setup Vagrant with bash provisioning that will install all the stuff
mentioned in documtentation. This is for being able to test the
deployment instructions mainly.
Moar vagrant. Try using passenger from a gem
Fix Gemfile
Vagrant in order and start/stop works, need to add upstart still
Initial upstart config, stopping does not work
Upstart script working now
Bootstrap now pretty much in order
Merge branch 'dev'

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/devise.rb