Update to nightly

Hi! I've made a couple updates to make everything compile against the current nighly (`rustc 0.13.0-nightly (ec28b4a6c 2014-11-04 03:36:55 +0000)`)