Merge pull request #35 from hpcugent/develop

documentation @ readthedocs.com (pre-release version)
version bump in docs
Merge branch 'master' of github.com:hpcugent/easybuild into develop

Conflicts:
	docs/conf.py