Added word count
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	Packages/User/Package Control.sublime-settings