Revert "think these 2 were causing errors on startup"

This reverts commit 7de27e5247049f5ca5a32efd18f71b6930887b13.
Revert "Merge remote-tracking branch 'holman/master'"

This reverts commit 51d123f53d9618eca8e77951c2b6bb1e6652a9d6, reversing
changes made to e87a7c75c5db3401b64f04a3531d3717ccd45e0f.
moved to ultisnip
Merge branch 'try_with_revert'
I like line wrappings