Move comment to line it up with others.
Merge remote-tracking branch 'upstream/develop' into develop
Made pre blocks nicer
Merge branch 'solarized' into develop