fixed vim events not responding bug
Merge branch 'development' of https://github.com/joeonmars/lisapark into development

Conflicts:
	js/addons.js