Switch to new expect syntax.

Created by: myronmarston

I used some vim macros to do most of the work here: http://nathanmlong.com/2012/11/convert-to-the-new-rspec-syntax-with-vim-macros/

It'd be nice to have someone skim this before I merge since so many of the changes were done by macros in bulk.