frank's stuff
Merge branch 'master' of github.com:Sammons/node-collaborator
Round 2
updates
Merge branch 'master' of github.com:Sammons/node-collaborator