tweaking tests, removing unittest.util for python2.6 support
giving up using 'setup.py test' for now
Merge branch 'master' of github.com:danmichaelo/mwtemplates

Conflicts:
	.travis.yml