Bump deps. Try catch on update-notifier
Merge branch 'master' of https://github.com/xhtmlized/generator-xh into update-notify-fix
Updated package.json
Merge branch 'thymikee-update-notify-fix'

Conflicts:
	app/index.js
	package.json