deps update, docs update
marganilia docs removed
project.clj updates
Merge branch 'master' into serpent

Conflicts:
	api/index.html
	api/org.azjure.cipher.aes.html
	api/org.azjure.cipher.blockcipher.html
	api/org.azjure.cipher.blowfish.html
	api/org.azjure.cipher.camellia.html
	api/org.azjure.cipher.cast5.html
	api/org.azjure.cipher.cast6.html
	api/org.azjure.cipher.chacha.html
	api/org.azjure.cipher.cipher.html
	api/org.azjure.cipher.grain128.html
	api/org.azjure.cipher.hc128.html
	api/org.azjure.cipher.hc256.html
	api/org.azjure.cipher.mickey2.html
	api/org.azjure.cipher.rabbit.html
	api/org.azjure.cipher.salsa20.html
	api/org.azjure.cipher.streamcipher.html
	api/org.azjure.cipher.tea.html
	api/org.azjure.cipher.testaes.html
	api/org.azjure.cipher.testblowfish.html
	api/org.azjure.cipher.testcast5.html
	api/org.azjure.cipher.testcast6.html
	api/org.azjure.cipher.testchacha.html
	api/org.azjure.cipher.testgrain128.html
	api/org.azjure.cipher.testhc128.html
	api/org.azjure.cipher.testhc256.html
	api/org.azjure.cipher.testmickey2.html
	api/org.azjure.cipher.testrabbit.html
	api/org.azjure.cipher.testsalsa20.html
	api/org.azjure.cipher.testtea.html
	api/org.azjure.cipher.testtrivium.html
	api/org.azjure.cipher.testtwofish.html
	api/org.azjure.cipher.testxtea.html
	api/org.azjure.cipher.trivium.html
	api/org.azjure.cipher.twofish.html
	api/org.azjure.cipher.xtea.html
	api/org.azjure.cryptsuite.html
	api/org.azjure.libbyte.html
	api/org.azjure.libcrypt.html
	api/org.azjure.libtest.html
	api/org.azjure.mode.cbc.html
	api/org.azjure.mode.cfb.html
	api/org.azjure.mode.ctr.html
	api/org.azjure.mode.ecb.html
	api/org.azjure.mode.modeofoperation.html
	api/org.azjure.mode.ofb.html
	api/org.azjure.mode.pcbc.html
	api/org.azjure.mode.testmode.html
	api/org.azjure.padding.iso10126pad.html
	api/org.azjure.padding.iso7816pad.html
	api/org.azjure.padding.pad.html
	api/org.azjure.padding.pkcs7pad.html
	api/org.azjure.padding.testpad.html
	api/org.azjure.padding.x923pad.html
	api/org.azjure.padding.zeropad.html
	api/org.azjure.testciphertext.html
	api/org.azjure.testivs.html
	api/org.azjure.testkeys.html
	api/org.azjure.testplaintext.html
	docs/toc.html