Added docblocks to Colours class

Added PHPDocumentor comments to the Colours class to aid future
maintainability.
Added docblocks to Colours class

Added PHPDocumentor comments to the Colours class to aid future
maintainability.
Merging remote branch as part of a rebase attempt
Merge pull request #3 from simpleigh/colour_docblocks

Added docblocks to Colours class
Added methods to Colours class to access colour codes directly

It would be handy to expose the colour code directly to increase the
flexibility of the class (with potential efficiency gains in output
size where many lines are coloured). Three methods were added to
enable this:

 - getForegroundCode($foregroundColour)
 - getBackgroundCode($backgroundColour)
 - getResetCode()

In addition, the string() method was adapted to make use of these.

Added unit tests for new Colours class methods

Simple unit tests for:
 - getForegroundCode($foregroundColour)
 - getBackgroundCode($backgroundColour)
 - getResetCode()
Bugfixes for previous merging horrors.