ticket:1 PEP8tify
ticket:1 reintegrating old test assignment from 1.3 to 1.6, part one
ticket:1 full test suite passed
ticket:1 clean up
Merge branch 'ticket1_bio'