Replace optparse with custom argument handler
Merge branch 'master' of github.com:forestbelton/words

Conflicts:
	bin/words