Test that the loader loads the user configuration
Removing FakeFS; doesn't seem to be speeding up the tests, but it does break them
Merge branch 'master' into fix_tests

Conflicts:
	Gemfile