Merge pull request #1 from silshack/gh-pages

Upstream updates merged
Merge pull request #2 from silshack/gh-pages

pull from master. Am I doing this backwards? i don't know?
Grant creates second post

woo, syntax highlighting
grant updates and renames second post
Merge pull request #161 from gerbal/gh-pages

Grant's second post