Some formatting
Merge branch 'master' of https://github.com/mschuldt/maml

Conflicts:
	maml_env.py

Flake8 Compliance issued
Verified tests were running properly / fixed one error I made