Preparing for integration with CLOC
Merge pull request #1 from saidler/master

Preparing for integration with CLOC