pep8 changes, bwa option parsing
Merge branch 'Scrum-apr-14' of ssh://github.com/CGATOxford/cgat into Scrum-apr-14