Support environment without bz2 module
Remove unnecessary comment out
Merge branch 'develop' of github.com:pfi/maf into develop