Updated procfile
deleted pycs
Fixed conflicts
Fixed conflicts
Fixed conflicts in requirements
Merge pull request #25 from keymholio/deploy_changes

Deploy changes