Merge branch 'development' of github.com:fangohr/virtualmicromagnetics into development

Conflicts:
	README.md

Author: mvousden

README.md

@@ -1,5 +1,3 @@
 Welcome to the Virtual Micromagnetics project repository!
 
-Check out our [![Documentation
-Status](https://readthedocs.org/projects/virtual-micromagnetics/badge/?version=latest)](http://virtual-micromagnetics.readthedocs.org/en/latest/?badge=latest)
-for information on building and using virtual environments.
+Check out our [![Documentation Status](https://readthedocs.org/projects/virtual-micromagnetics/badge/?version=development)](http://virtual-micromagnetics.readthedocs.org/en/development) for information on building and using virtual environments.