Update for vec API changes
Update to new inner attribute syntax
Merge branch 'master' into andrew-fork

Conflicts:
	ssl/error.rs
	ssl/mod.rs