Added the watched-types configuration.
Merge branch 'master'

Conflicts:
	lib/args.js
Removed duplicate function.
Added the code to allow a user to define a watched resource in the .shifter.json file.
Added the watched-types configuration.