various
Merge branch 'master' of github.com:marius311/mspec

Conflicts:
	mspec/mspec.py