Update of source/
Updated sass/
Update plugins
Merge pull request #6 from octopress/bring-in-site-2.1-branch

Bring in site 2.1 branch