Look ma, no tests
Drops unused files
Merge branch 'master' into backbone