Failing test proving lack of expanduser
Rub some expanduser on it
Merge branch 'file-adapter-expandpath' into integrated

Conflicts:
	etcaetera/adapter/file.py
	tests/adapter/test_file.py