Merge pull request #27 from gfscott/master

Colour scheme cleanup, variable cleanup in screen.scss, adding comments