Use source/CNAME (if it exists) to set _config.yml url property
Extract method
Improved readability
Removed outdated ruby version manager configurations; update to .ruby-version
Let's use the specified format - https://gist.github.com/fnichol/1912050
Merge pull request #1328 from sharethrough/master

Use the CNAME from /source when (re)generating _config.yml
Merge pull request #1330 from rslifka/master

Use version-manager-agnostic Ruby version specification
Fixed setup_github_pages success message. #1328
Fixed blog_url for personal github pages projects. #1328
Set a fixed version for directory_watcher gem.
Update Gemfile.lock.
misc update
Merge remote-tracking branch 'octopress/master'

Conflicts:
	Gemfile
normal update
add functional-differential-geometry