Colin's change.
Merge branch 'master' of https://github.com/sprice/node-relay

Conflicts:
	index.js
Merge pull request #3 from cjsmith/master

Colin's change.