Removed window switching (it doesn't work).  Added ultisnips module.