Remove resources
Merge branch 'master' into resources

Conflicts:
	chisel/app.py
	chisel/tests/test_app.py
Merge branch 'master' into resources
Cleanup compat
Bump version to 0.6.0