Cleanup
Merge branch 'ycm-0.1'