Merge pull request #8 from MattDSD/alisa

Added faker to gemfile
Hopefully fixed Heroku prob, added timeout
Changed timeout value to 30
Changed timeout to 15000
Added pool value to config
increased pool value