Merge pull request #42 from jordyd/master

Switch from rustpkg to rustc