Fix 1656 - & needs specific quoting under Windows
Merge pull request #1684 from tangledhelix/feature-windows-ampersand

Fix 1656 - & needs specific quoting under Windows. Closes #1656.
Add two new posts
Add page for CV
Merge branch 'master' of git://github.com/imathis/octopress
Update jekyll-sitemap to 0.6.3
Update a couple gems
Customize the date_format
Disable pinboard & delicious in config
Patch code blocks to use Bootstrap panels
Patch categories to use Bootstrap's labels
Use the bootswatch theme Flatly
Add the About link to the navigation bar
Update post to use code block
Include the About aside in the right column.