Correct #[crate_id =..] and minor changes
Merge branch 'master' into 1

Conflicts:
	.gitignore
	.travis.yml
	src/knob/lib.rs