Implicits tour draft

CODE_OF_CONDUCT.md

@@ -0,0 +1,78 @@
+## Scala Code of Conduct
+
+We are committed to providing a friendly, safe and welcoming environment for
+all, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity,
+age, religion, nationality, or other such characteristics.
+
+### Our Standards
+
+**Whether you’re a regular contributor or a newcomer, we care about making this community a welcoming and safe place for you and we’ve got your back.**
+
+As a member of the community, you agree to the following:
+
+**Encouraged:**
+
+- Be kind and courteous.
+- Respect differences of opinion and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer.
+- Remember that everyone was new to Scala at some point. We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Assume competence.
+- Show empathy towards other community members.
+
+**Discouraged:**
+
+- Keep unstructured critique to a minimum. We encourage sharing ideas and perspectives, so please ensure that your feedback is constructive and relevant. If you have solid ideas you want to experiment with, make a fork and see how it works.
+- Avoid aggressive and micro-aggressive behavior, such as unconstructive criticism, providing corrections that do not improve the conversation (sometimes referred to as "well actually"s), repeatedly interrupting or talking over someone else, feigning surprise at someone’s lack of knowledge or awareness about a topic, or subtle prejudice (for example, comments like “That’s so easy my grandmother could do it.”). For more examples of this kind of behavior, [see the Recurse Center's user manual](https://www.recurse.com/manual#sec-environment).
+- We will exclude you from interaction if you insult, demean or harass anyone. The term “Harassment” includes “Unacceptable Behavior” described in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). **In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.**
+- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member's behavior, please contact one of the [moderators](https://contributors.scala-lang.org/about) or any member of the [Scala Center](http://scala.epfl.ch/) immediately.
+- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
+
+### Moderation
+
+These are the policies for upholding our community’s standards of conduct. If
+you feel that a thread needs moderation, please contact anyone on the
+[moderation team](https://contributors.scala-lang.org/about), or any employee of
+the [Scala Center](https://scala.epfl.ch/).
+
+- Remarks that violate the above code of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
+- Moderators will warn users who make remarks inconsistent with the above code of conduct.
+- If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
+- If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
+- Moderators may choose at their discretion to un-ban the user if it was a first offense and they if they make suitable amends with the offended party.
+- If you think a ban is unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed.
+- Moderators are held to a higher standard than other community members. If a moderator acts inappropriately, they should expect less leeway than others.
+
+In the Scala community we strive to go the extra step to look out for each
+other. Don’t just aim to be technically unimpeachable; try to be your best self.
+In particular, avoid exacerbating offensive or sensitive issues, particularly if
+they’re off-topic; this all too often leads to unnecessary fights, hurt
+feelings, and damaged trust; worse, it can drive people away from the community
+entirely.
+
+If someone takes issue with something you said or did, resist the urge to be
+defensive. Rather, stop the offending behavior, apologize, and be sensitive
+thereafter. Even if you feel you were misinterpreted or unfairly accused,
+chances are good there was something you could’ve communicated better — remember
+that it’s your responsibility to make your fellow Scala developers comfortable.
+We are all here first and foremost because we want to talk about cool
+technology, and everyone wants to get along in doing so. People are generally
+eager to assume good intent and forgive.
+
+### Domain
+
+The enforcement policies listed above apply to all official Scala channels:
+mailing lists, GitHub repositories and Gitter channels under scala and
+scalacenter, Discourse, and Scala Center venues and hackathons. For other
+projects adopting the Scala Code of Conduct, please contact the maintainers of
+those projects for enforcement. If you wish to use this code of conduct for your
+own project, consider explicitly mentioning your moderation policy or making a
+copy with your own moderation policy so as to avoid confusion.
+
+### Credits
+
+Adapted from and/or inspired by multiple successful Codes of Conduct, including:
+
+* [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html)
+* [The Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)
+* [The Contributor Covenant v1.4.0](http://contributor-covenant.org/version/1/4/)
+* [The Recurse Center's User Manual](https://www.recurse.com/manual#sec-environment)
+* [The 18F Code of Conduct](https://18f.gsa.gov/code-of-conduct/)

Gemfile.lock

@@ -1,61 +1,79 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    ethon (0.9.1)
+    ethon (0.10.1)
       ffi (>= 1.3.0)
     execjs (2.7.0)
-    faraday (0.9.2)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.18)
     forwardable-extended (2.6.0)
-    gemoji (2.1.0)
-    github-pages (104)
-      activesupport (= 4.2.7)
-      github-pages-health-check (= 1.2.0)
-      jekyll (= 3.3.0)
+    gemoji (3.0.0)
+    github-pages (143)
+      activesupport (= 4.2.8)
+      github-pages-health-check (= 1.3.4)
+      jekyll (= 3.4.5)
       jekyll-avatar (= 0.4.2)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.8.0)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.9.2)
       jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 2.2.0)
+      jekyll-github-metadata (= 2.4.0)
       jekyll-mentions (= 1.2.0)
+      jekyll-optional-front-matter (= 0.1.2)
       jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.11.0)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 2.1.0)
-      jekyll-sitemap (= 0.12.0)
+      jekyll-readme-index (= 0.1.0)
+      jekyll-redirect-from (= 0.12.1)
+      jekyll-relative-links (= 0.4.1)
+      jekyll-sass-converter (= 1.5.0)
+      jekyll-seo-tag (= 2.2.3)
+      jekyll-sitemap (= 1.0.0)
       jekyll-swiss (= 0.4.0)
-      jemoji (= 0.7.0)
-      kramdown (= 1.11.1)
+      jekyll-theme-architect (= 0.0.4)
+      jekyll-theme-cayman (= 0.0.4)
+      jekyll-theme-dinky (= 0.0.4)
+      jekyll-theme-hacker (= 0.0.4)
+      jekyll-theme-leap-day (= 0.0.4)
+      jekyll-theme-merlot (= 0.0.4)
+      jekyll-theme-midnight (= 0.0.4)
+      jekyll-theme-minimal (= 0.0.4)
+      jekyll-theme-modernist (= 0.0.4)
+      jekyll-theme-primer (= 0.3.0)
+      jekyll-theme-slate (= 0.0.4)
+      jekyll-theme-tactile (= 0.0.4)
+      jekyll-theme-time-machine (= 0.0.4)
+      jekyll-titles-from-headings (= 0.2.0)
+      jemoji (= 0.8.0)
+      kramdown (= 1.13.2)
       liquid (= 3.0.6)
       listen (= 3.0.6)
       mercenary (~> 0.3)
-      minima (= 2.0.0)
+      minima (= 2.1.1)
       rouge (= 1.11.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.2.0)
+    github-pages-health-check (1.3.4)
       addressable (~> 2.3)
       net-dns (~> 0.8)
       octokit (~> 4.0)
-      public_suffix (~> 1.4)
+      public_suffix (~> 2.0)
       typhoeus (~> 0.7)
-    html-pipeline (2.4.2)
+    html-pipeline (2.6.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    i18n (0.7.0)
-    jekyll (3.3.0)
+    i18n (0.8.6)
+    jekyll (3.4.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -70,32 +88,68 @@ GEM
       jekyll (~> 3.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-feed (0.8.0)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.9.2)
       jekyll (~> 3.3)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.2.0)
+    jekyll-github-metadata (2.4.0)
       jekyll (~> 3.1)
       octokit (~> 4.0, != 4.4.0)
     jekyll-mentions (1.2.0)
       activesupport (~> 4.0)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.1.2)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (2.1.0)
+    jekyll-readme-index (0.1.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.12.1)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.4.1)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.2.3)
       jekyll (~> 3.3)
-    jekyll-sitemap (0.12.0)
+    jekyll-sitemap (1.0.0)
       jekyll (~> 3.3)
     jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-cayman (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-dinky (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-leap-day (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-merlot (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-midnight (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-minimal (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-modernist (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-primer (0.3.0)
+      jekyll (~> 3.3)
+    jekyll-theme-slate (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-tactile (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-time-machine (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.2.0)
+      jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jemoji (0.7.0)
+    jemoji (0.8.0)
       activesupport (~> 4.0)
-      gemoji (~> 2.0)
+      gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
     json (1.8.6)
@@ -106,34 +160,39 @@ GEM
       rb-inotify (>= 0.9.7)
     mercenary (0.3.6)
     mini_portile2 (2.1.0)
-    minima (2.0.0)
-    minitest (5.9.1)
+    minima (2.1.1)
+      jekyll (~> 3.3)
+    minitest (5.10.2)
     multipart-post (2.0.0)
     net-dns (0.8.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    octokit (4.4.1)
-      sawyer (~> 0.7.0, >= 0.5.3)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
-    public_suffix (1.5.3)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    public_suffix (2.0.5)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.22)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thread_safe (0.3.5)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.3.0)
 
 PLATFORMS
   ruby
@@ -143,4 +202,4 @@ DEPENDENCIES
   jekyll-redirect-from
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

conduct.html

@@ -6,6 +6,6 @@
 <body>
   <h2>Redirecting you to the Scala Code of Conduct...</h2>
   <script type="text/javascript">
-    window.location.replace('http://scala-lang.org/conduct.html');
+    window.location.replace('http://scala-lang.org/conduct/');
   </script>
 </body>