Merge branch 'update-gem-dev-framework-and-support-more-smtp-clients'
into lsiden-pullreq ( Closes mmower/mailtrap#2 )

 - Fixed Gemfile dev/test dependencies ^_^
 - Using pattern instead of list of files for RSpec

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock
	Rakefile
	spec/spec.opts
Merge branch 'develop' of github.com:trinitronx/mailtrap into develop