added check for custom commands so that we can use the constructor format
Merge branch 'custom-commands-fix' into mobify
Merge branch 'mobify' of github.com:mobify/nightwatch into mobify

Conflicts:
	lib/index.js