Cleanup code style issues.
Merge branch 'develop' of hitc14:Minerva/python/minerva into develop

Conflicts:
	python-package/scripts/create-aliases