update gems

switch to rspec 3 syntax using transpec gem
Merge remote-tracking branch 'origin/master' into update-gems

Conflicts:
	tricle.gemspec
more gem updates
specify rspec command to be run through guard
Merge pull request #66 from afeld/update-gems

update gems