Merge branch 'master' of github.com:burdges/lioness-rs

Conflicts:
	.travis.yml
	Cargo.toml

.travis.yml

@@ -9,3 +9,6 @@ matrix:
 script:
  - cargo build --verbose
  - cargo test --verbose
+matrix:
+  allow_failures:
+    - rust: nightly

Cargo.toml

@@ -7,7 +7,7 @@ homepage = "https://github.com/burdges/lioness-rs"
 repository = "https://github.com/burdges/lioness-rs.git"
 documentation = "https://docs.rs/lioness/"
 readme = "README.md"
-keywords = ["cryptography","cipher","onion","lioness","mixnet"]
+keywords = ["cryptography","cipher","lioness", "sphinx", "mixnet"]
 license = "MIT"
 
 [dependencies]

README.md

@@ -1,11 +1,17 @@
+
+[![travis build status](https://travis-ci.org/burdges/lioness-rs?branch=master)](https://www.travis-ci.org/burgdes/lioness-rs)
+[![documenation](https://docs.rs/lioness/badge.svg)](https://docs.rs/lioness/)
+
+
+
 This crate provides the Lioness wide block cipher instantiated with ChaCha20 and Blake2b.
 
 [![Build status](https://api.travis-ci.org/burdges/lioness-rs.png)](https://travis-ci.org/burdges/lioness-rs)
 [![](https://docs.rs/lioness/badge.svg)](https://docs.rs/lioness/)
 
 ### Documentation
 
-There is documentation with examples at [https://docs.rs/lioness/](https://docs.rs/lioness/)
+api docs here: <https://docs.rs/lioness/>
 
 _read the paper_
 **Two Practical and Provably Secure Block Ciphers: BEAR and LION**
@@ -31,6 +37,3 @@ extern crate liones;
 
 ...
 ```
-
-You might need nightly rust via `./rustup.sh --channel=nightly`.
-