Merge branch 'codebykat/master': Upgraded to run on Mavericks, with virtualenv and requirements.txt
No longer use buildout to generate utray script.
Move config parsing to seperate module.
Refactor installation to no longer use buildout.
Merge remote-tracking branch 'codebykat/master'

Conflicts:
	README.rst
	bootstrap.py
	requirements.txt
Merge branch 'master' into forked-version