Merge branch 'master' of github.com:tanner-carter/jails

Conflicts:
	lib/jails.js
Merge branch 'master' of github.com:tanner-carter/jails