Rationalizing some color stuff, cleaning code, commenting and labelling
Rationalizing colour scheme stuff, cleaning up code, commenting
Resolving conflict on screen.scss and merging
Merge pull request #27 from gfscott/master

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