Merge pull request #27 from OckhamsRazor/bosh

Bosh
icon
icon
Merge pull request #28 from OckhamsRazor/YLC

icon
speak
Merge pull request #29 from OckhamsRazor/janelai

Janelai
conflict
aa