Merge branch 'develop'
Merge branch 'master' of github.com:researchcompendia/tyler
Merge branch 'master' of heroku.com:rose-tyler-alpha into develop
fixed flake8 errors