tweaks
Merge branch 'master' of https://github.com/dfm/bart

Conflicts:
	examples/injection/injection.py