Change config for my dev build
Change .travis.yml for me
No increment for a local build
Ignore generated files by grunt
Merge branch 'refs/heads/require' into dev2
Merge branch 'refs/heads/topic' into dev2