Merging hotfixes from master
Adding some hacky shonk to speed up travis builds when nothing needs to actually run (due an incompatible combination of python version and django)
Merging hotfixes from master branch
Merging from master
Adding some hacky shonk to speed up travis builds when nothing needs to actually run (due an incompatible combination of python version and django)
Merge branch 'develop'
Fixing version to 0.5.5 after merge from develop