Merge pull request #11 from percyliang/master

Revamped configuration system / generalize cl run