Add the 'carrierwave' gem to the gemfile

Will use the gem to handle uploading to the server
readded removed migration user
Merge branch 'master' into sebastian