Merge branch 'master' into master

Author: Diggsey

.gitignore

@@ -2,5 +2,6 @@
 /target
 /Cargo.lock
 /.settings
+/.idea/
 *~
 /**/target

.travis.yml

@@ -156,9 +156,3 @@ deploy:
       secure: "fcKM0bWHz1UJVnZdQl/kCrFCykDkdwOAy1o5LAsUEkgNwSiWF4qC2sqHUbz2hCIe2tD5D8UCqa7brgSz0HNTL1yvSeOO/0Vim8xP9ev9SMf0Muekq0Wj/Kw4kJ3C4ajHdOdF2zXGnw9tsitzylLqx/r8cu0S8UtI49sIAWF3+/dD/uGnXu+wtaYiUJ1znirDzq74rHLrk8M/kQDFTrDJ8D+wXbKSJP9nmKkFShkW8A71QmaCOUqG3q7SpylY81rKRjHjtXCWJ3CHkD7XpdxdsImnukDtt8OndJH+9691TPKcR/RUC/dnUYg5QignmV83AN84c2/6ZykarQ9M/ziBYRI92bj0vPhoHu/vk2HY1VgWlX9qbXfVzd8glfmtS6be7eNYPtEHxoSu9o6WSbVaFv/07IapY/f7vE0kflvW58hRjdy8k4Sv31qPFO0hs7NFJMCRCam/uPpWKTEhfIjAJH6PoXOvND92ZHi9rjnwfVtXEClYtl5vPkRgPTkKJXzF+jVl9sDX1WhZhfgqRNNWEVyfoiptNxHygavDGCPsjpKVMmvntM8dsMZmewSeKemratN2seTP5q4d/IVbgONXiH/SDFhzXkIy4W/MdbxEjXBaVW0DT7x5k/CZhx1ZBIquWhE52nZWpBsJdpCiWl9AORDYVQnCjNp8hWXX7TlIBe4="
     on:
       branch: stable
-
-# FIXME: I don't know if this really works
-after_deploy:
-  - sudo pip install awscli
-  - aws configure set preview.cloudfront true
-  - aws cloudfront create-invalidation --paths "rustup/$TARGET/* rustup/dev/$TARGET/* rustup/www/* rustup/dev/www/* rustup/* rustup/dev/*"

CHANGELOG.md

@@ -1,3 +1,39 @@
+# 1.11.0
+
+* [windows: detect architecture on website, update to matching arch][pr1354]
+
+[pr1354]: https://github.com/rust-lang-nursery/rustup.rs/pull/1354
+
+Contributors: Steffen Butzer
+
+# 1.10.0
+
+* [Warn when tools are missing and allow an override][pr1337]
+
+[pr1337]: https://github.com/rust-lang-nursery/rustup.rs/pull/1337
+
+Contributors: Nick Cameron, Steffen Butzer
+
+# 1.9.0
+
+* [Fix self update errors filling in missing proxies][pr1326]
+
+[pr1326]: https://github.com/rust-lang-nursery/rustup.rs/pull/1326
+
+Contributors: Alex Crichton
+
+# 1.8.0
+
+* [Add `rustup run --install`][pr1295]
+* [Prevent `rustup update` to a toolchain without `rustc` or `cargo`][pr1298]
+* [Add support for `rustfmt` shims][pr1294]
+
+[pr1295]: https://github.com/rust-lang-nursery/rustup.rs/pull/1295
+[pr1298]: https://github.com/rust-lang-nursery/rustup.rs/pull/1298
+[pr1294]: https://github.com/rust-lang-nursery/rustup.rs/pull/1294
+
+Contributors: Alex Crichton, kennytm, Nick Cameron, Simon Sapin, Who? Me?!
+
 # 1.7.0
 
 * [Improve clarity of component errors][pr1255]