Merge pull request #6 from mellowcoder/week3_part2

Week3 part2
Merge pull request #7 from mellowcoder/week4_part1

Week4 part1
merging updates for heroku from branch
changing to use unicorn in production
Adding Procfile for use on heroku
removing Rack Timeout for now