one up
Merge branch 'master' of github.com:fliphess/yaml-settingsfile

Conflicts:
	setup.py