minor
Merge branch 'master' of github.com:NicholasMerrill/clean-gmail

Conflicts:
	clean-gmail.rb