Fix merge conflict and remove SublimeBlockCursor repo
Update changes since last time, inluding new keymappings, rails model template snippet, and more...