Merge pull request #52 from apesic/master

Added design doc, fixed gemfile for heroku