Github Pages deployment is now using `git add -A` for compatability with Git 1.8.2+
Merge branch 'master' of git://github.com/imathis/octopress into source
Use protocol relative URL for Twitter
Fix second Twitter URL to be protocol relative
Merge pull request #1286 from SamWhited/master

Use protocol relative URL's for Twitter
Merge branch 'master' of git://github.com/imathis/octopress into source
Merged changes from octopress/master into custom theme and current source