Merge branch 'master' of github.com:colinta/sweettea

Conflicts:
	lib/sweettea/handlers.rb
Merge branch 'master' of github.com:colinta/sweettea