Added design doc, fixed gemfile for heroku

Git merge loop of hell. What happened? Everything's working though.