Version 0.2.5
Version 0.3.0
Merge branch 'develop'
Merge branch 'develop'
Fix attribute error
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add some tests
Merge branch 'develop'

Conflicts:
	trachet/__init__.py