testing backwards compat
new features, added to API
Merge branch 'master' of github.com:jasonknight/ichabod

Conflicts:
	examples/salor_hospitality.js
checking sh compat