removed capitalization issues
Merge branch 'develop' of https://github.com/rixx/marquote into develop

Conflicts:
	marquote/Parser/startrek.py
	marquote/chain.py