Revert ce99311..fcd4e2e

This rolls back to commit ce993119e6385005fc94d01538979b1d9f93a964.
Revert fcd4e2e..59afb29

This rolls back to commit fcd4e2e2aa0039afcb8b50088c2f9c42d10052a7.
Merge branch 'master' of https://github.com/Windsplunts/node-can