Increase command mode input size for vim-mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	.atom/config.cson