Refactor command-line option handling.
Merge commit '0e3266ee050e521c5ea0ba498e074428bfba465e' into feature/errormsg

Conflicts:
	codekitlang/command.py