1.8 compatibility changes

For comparison with #152 and #147
Should this maybe go in your `.vimrc` instead of here?