updated files to not kaboom on watch
Merge branch 'master' of github.com:jnettik-e3/dcco-2014