capture stderr messages from khmer/file.py errors
Merge remote-tracking branch 'origin' into cleanup/filepy2
updated ChangeLog for test_script_arguments.py mods
Merge remote-tracking branch 'origin' into cleanup/filepy2

Conflicts:
	ChangeLog
Merge branch 'master' of github.com:ged-lab/khmer into cleanup/filepy2
Merge remote-tracking branch 'origin' into cleanup/filepy2

Conflicts:
	ChangeLog
+ --report_total_kmers
adding --report_total_kmers to load-graph.py
PEP8
use oldschool print statements for now
Merge pull request #487 from ged-lab/cleanup/filepy2

capture stderr messages from khmer/file.py errors
Merge pull request #491 from ged-lab/feature/report-total-kmers

--report_total_kmers
set sandbox tests to skip when sandbox scripts are not available
Merge branch 'master' of github.com:ged-lab/khmer into fixes/sweep-reads

Conflicts:
	ChangeLog