added threading support for django httpd service
testing threading in httpd
reduce number of threads for travis
try .travis.yml fixes
Fix forgotten SMTPException import
Remove duplicate __repr__ in Step class
Merge pull request #435 from infoxchange/fix-core-repr

Remove duplicate __repr__ in Step class
Merge remote-tracking branch 'upstream/master' into fix-django-mail-import
Add message to SMTPException
Add test for SMTPException step
Merge pull request #434 from infoxchange/fix-django-mail-import

Fix forgotten SMTPException import
merge with new version
Merge pull request #392 from wpjunior/httpd_threading

Threading support for django httpd service
fix for feature results when there are no features found in a django app from harvest
Merge pull request #439 from Andrew-Crosio/feature_results_fix

fix for feature results when there are no features found in a django app from harvest
Merge branch 'master' into new-parser

Conflicts:
	lettuce/core.py
Properly initialize TotalResult