tidy
Merge branch 'master' of github.com:chrisfleming/octopress
Commented out the wrap youtube stuff for now. Pulled in full jquery to help debugging, should be minified by asset pipeline. added categories to feed