Update for latest rust language changes.
Merge branch 'rust-master' of https://github.com/am0d/rust-pcre into master

Conflicts:
	src/pcre/pkg.rs