Update gemfile to use https
Make control-c exit clean
Slight refactor.
Update gems, tested to work on ruby 1.9, 2.0 and 2.1
Rewrite specs to use new expects form