Remove redundant files; closes #42
Merge branch 'master' into improving-ui-consistency