added ssh to ignore rules
Merge branch 'develop' into staging
changed pool settings for heroku