Merge branch 'master' into travis-ci
reconfigured travis
added port to procfile
added dpeloyment scripts and travis config