Add requirements for heroku
Add support for servername
Rebased