minor fixes
mh work
Merge branch 'classini' of github.com:marius311/cosmoslik into classini

Conflicts:
	cosmoslik_plugins/samplers/metropolis_hastings.py