Merge branch 'cvn-master'
Merge branch 'tooling' of https://github.com/cvn/angular-shims-placeholder into cvn-tooling
Merge branch 'cvn-tooling'
Merge branch 'tooling' of https://github.com/cvn/angular-shims-placeholder
Adding grunt watch command to auto-build dist files on file save