Test inherited props are ignored in merge strategy
Gitignore coveralls.yml
Clean up gulp file, add watch task