Merge branch 'develop'
Merge branch 'develop'
Last of the Python 2.6 string format fixes
Redeploy because of dodgy build environment

New version needed to trigger updates on PyPi mirrors
Include CHANGES in documentation
Make documentation show correct version
Update FAQs on dependencies
Fix versioning error
Enforce minimum versions for dependencies

This should fix problems people were having with older versions of
dependencies
Fix bug in FOS calculation
Merge upstream changes from MASTER