A couple paragraphs here and there.

I'm using pygments for the syntax highlighting so:
- sudo apt-get install pygmentize
- sudo port install pygmentize
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	draft/introduction.tex

Thomas, I added an \xspace which does what you want (I think).