housekeeping
change demo to mode that works with my SSTV client
fix merge conflict
update comments in code based on README.md
    decent coverage of colors.py/MartinM1
    decent coverage of sstv.py
changed per dnet's suggestions
update requirements.txt to include testing dependencies
Merge pull request #1 from jpf/master

test suite