Restructuring and bugfixes
Merge branch 'master' of github.com:shc7pw/clierly

Conflicts:
	NLP/parsers/keyword/parser.py
	NLP/parsers/keyword/parser.pyc
	application.py