Removed stuff.
Chabged keyword set.
Merge with upstream.
Merge branch 'master' of github.com:eugeneai/py-prisnif into HEAD

Conflicts:
	.gitmodules
	install.sh
Removed old files.