Update to rust master
Merge pull request #27 from mikedilger/update_serialize

Update to rust master
Implement the libstd error trait for errors
fix error on master
Merge pull request #28 from steveklabnik/master

fix error on master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/serialization.rs