Merge pull request #42 from jdm/rustup2

Unswap some min and maxes.
Fix warnings
Update to current rust: use the new attributes syntax.

Builds with mozilla/rust@e263ef1df7b892ed29e53313565eb05ab75e52f4.
Merge pull request #45 from mozilla-servo/rustup_20140410

Update to current rust
Merge pull request #43 from SimonSapin/master

Fix warnings