Fixed indentation and resolved an unresolved merge conflict
Added 'choices' restriction to strategies argument
Renamed --noweights to --weight and made no-weighting the default

Also replaced sum() with the more robust math.fsum in a few places.
Changed default alpha from 0.05 to 0.005, per recommendation

See: http://www.pnas.org/content/early/2013/10/28/1313476110
cladereport, cladeweb: future-proof w/ print_statement
cladecomparelib: updated with __future__ imports (forward compat)
Use Biopython's StringIO import shim (for Py3 compatibility)
cladereport: added '--output' option
If a subprocess fails, capture and print its output & error messages
Added --pmlout option
Added Deja Vu truetype font file to this package/distribution
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cladecomparelib/core.py
	cladecomparelib/hypg.py
	test/Makefile