Merge pull request #1408 from elm-lang/dev

Update link to JS style guide

CONTRIBUTING.md

@@ -15,7 +15,7 @@ and send it to <[email protected]> before opening your pull request.
   * JavaScript &mdash; use [Google's JS style guide][js]
 
 [haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
-[js]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
+[js]: https://google.github.io/styleguide/javascriptguide.xml
 
 ## Branches
 

elm-compiler.cabal

@@ -1,6 +1,6 @@
 
 Name: elm-compiler
-Version: 0.17
+Version: 0.17.1
 
 Synopsis:
     Values to help with elm-package, elm-make, and elm-lang.org.

src/CommandLineRouter.hs

@@ -10,6 +10,8 @@ import GHC.IO.Encoding (setLocaleEncoding, utf8)
 import qualified Elm.Compiler.Version as Compiler
 import qualified Elm.Package as Pkg
 
+
+
 main :: IO ()
 main =
   do  setLocaleEncoding utf8
@@ -19,6 +21,12 @@ main =
         [] ->
           putStrLn usageMessage
 
+        "--version" ->
+          putStrLn $ Pkg.versionToString Compiler.version
+
+        "-v" ->
+          putStrLn $ Pkg.versionToString Compiler.version
+
         command : args ->
           attemptToRun command args
 
@@ -50,7 +58,7 @@ attemptToRun command args =
 
 usageMessage :: String
 usageMessage =
-  "Elm Platform " ++ (Pkg.versionToString Compiler.version) ++ " - a way to run all Elm tools\n\
+  "Elm Platform " ++ Pkg.versionToString Compiler.version ++ " - a way to run all Elm tools\n\
   \\n\
   \Usage: elm <command> [<args>]\n\
   \\n\