Merge pull request #37 from simensta/development

Merge Development into Master for deployment
added procfile for deployment
changed app server to unicorn
bundled for deployment
added unicorn config file
damn you, gemfile
prepping for deployment
precompiled assets
removing unicorn files and redeploying
removing unicorn
fixed conflict before master merge