Merge branch 'hotfix/procfile'
whoops
added dependancies
Merge branch 'hotfix/justforfun'
Merge branch 'hotfix/justforfun' into develop
bumped release number
Merge branch 'release/0.1.2'
Merge branch 'release/0.1.2' into develop
fixed port variable for heroku
Merge branch 'hotfix/portvar'
Merge branch 'hotfix/portvar' into develop
ahh - its an or statement, not a pipe
Merge branch 'hotfix/notapipe' into develop