Working on syntax highlighting
Merge branch 'master' of github.com:sass/sass.github.com & added syntax highlighting

Conflicts:
	Gemfile.lock

Still need to go through and migrate the old code blocks to use the syntax highlighting.
Merge branch 'master' of github.com:sass/sass.github.com