Added more language features
Merge branch 'master' of github.com:yuanchenyang/cs164-mode

Conflicts:
	cs164-mode.el