Use crates.io deps
Merge branches 'master' and 'master' of github.com:cmr/alexandria-server

Conflicts:
	Cargo.toml