make clean rule
Merge branch 'master' into uber-refactor