removed silly log and fixed error
:lipstick:, :memo:
Merge branch 'master' into marks

Conflicts:
	keymaps/vim-mode.cson
	lib/motions.coffee
Merge pull request #180 from danzimm/marks

Added marks
Add marks to changelog
Merge branch 'master' into refactor-vm
yay merging
Conflicts:
	keymaps/vim-mode.cson
	lib/motions.coffee
	lib/move-to-mark-view-model.coffee
	lib/vim-state.coffee