Fixing .travis script to ignore installation of dependencies when the combination of django/python versions are not compatible
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
Merging latest master branch
Merging master