Cleanup Directory
Merge branch 'master' of http://github.com/traviswingo/coen11