Reviewed by Carey.  v0.9 almost ready to go live, second scan would be nice.
Merge branch 'master' of https://github.com/Komodo/komodo-website

Conflicts:
	src/pages/blog/2014-03/adding-custom-komodo-snippets-with-macros.html.md
Merge conflict missed in last commit
blog: custom snippets: typo fix
blog: custom snippets: more typo fixes
Changes to Carey's blog to make it a bit more streamlined
Merge branch 'master' of github.com:Komodo/komodo-website

Conflicts:
	src/pages/blog/2014-03/adding-custom-komodo-snippets-with-macros.html.md
Code higlight tweaks
blog: custom snippets: confirming and reverting edits.
Title changes again (agreed on by Carey)
Removed duplicate entry of careys blog
Name change, title change