Fix gruntfile for cca
Merge pull request #115 from uProxy/dborkan-cca

Fix gruntfile for cca
fix npmignore
minmized .npmignore to just extra needed files (sublime .workspace)
Merge pull request #116 from uProxy/iislucas-fix-npmignore

Fix npmignore
Merge branch 'dev' into trevj-churn
minor bump for new churn integration