Not tested locally due to Heroku freezing, but let's try it on Travis
Merge pull request #171 from alxdarksage/develop

Not tested locally due to Heroku freezing, but let's try it on Travis
Changes in support of the build
Merge pull request #172 from alxdarksage/develop

Changes in support of the build
Merge remote-tracking branch 'base/develop' into develop
Discard.