properly assign context for Constructor style custom commands
Merge branch 'custom-commands-fix' into mobify

Conflicts:
	lib/index.js