Upgrade gems to match jekyll 2.0
Set the baseurl to an empty string
Remove the old generated style.css
Add sass configuration and move style.scss file

Adding the sass configuration and moving the style.css file will allow us to use jekyll-sass-converter to generate the style.css file without needing an external sass command.
Update blog to latest jekyll and update deps.

Updated the blog to the current latest jekyll 2.1.0, also updated jekyll-sitemap to version 0.5 to work with jekyll 2.1.
Update jekyll to version 2.1.1 and rouge to 1.5.1
Update jekyll to 2.2 using github-pages gem
Remove the layout from the feed.atom

Removing this layout: nil to remove the layout warning
Move normalize to a sass partial

This in order to concatenate this file also.
Apply the normalize partial to the style.css file
Fix Gemfile conflics in merge