Attempt to improve VIM mode
Fixed typo
Merge branch 'master' of github.com:carlesandres/textmarkr

Conflicts:
	app/scripts/controllers/MainController.js