mcfilter test and tests
Merge remote-tracking branch 'origin/0.4-dev' into 0.4-dev

Conflicts:
	test/test_mcfilter.py
changing default to update internals to False