Update version
Merge branch 'develop'
Update TFF
Remove trailing spaces
Fix for the install issue that $HOME/.trachet is created by root user
Add some tests
Update version
Merge branch 'master' into develop

Conflicts:
	trachet/__init__.py