A few little fixes for things that seem out of date. I also cannot get the tests to run correctly, vows is immediately throwing an error...
lloyd
