Merge pull request #25 from jedisct1/erickt-rebase

Minor changes for rust -master
"extern mod" became "extern crate"