Revert #2172, pretty much. (#2387)

* Revert #2172, pretty much.

* Tidy up whitespace.

[ci:skip]

* Force CI.

parity/cli/usage.txt

@@ -31,8 +31,8 @@ Operating Options:
                            (default: {flag_mode_alarm}).
   --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                            JSON chain specification file or olympic, frontier,
-                           homestead, mainnet, morden, classic or testnet
-                           (default: {flag_chain}).
+                           homestead, mainnet, morden, classic, expanse or
+                           testnet (default: {flag_chain}).
   -d --db-path PATH        Specify the database & configuration directory path
                            (default: {flag_db_path}).
   --keys-path PATH         Specify the path for JSON key files to be found