Fixes #15. Mainly references to JID.JID (which should now be just JID)
Missed a save
Merge pull request #16 from node-xmpp/issue-15

Fix for Issue 15
Merge branch 'master' of github.com:node-xmpp/node-xmpp-server into api

Conflicts:
	index.js