I did magic.

Jk, I fixed something (command line tests)
Merge branch 'master' of github.com:AaronGoldman/ccfs