Add some tests
Merge branch 'develop'

Conflicts:
	trachet/__init__.py