Clean up directory
Merge branch 'master' of https://github.com/dxwang/flicks-