Bump Rack version to leverage security fixes.
Remove cruft from Gemfile.lock since rspec is no longer specified in the Gemfile.
Allow .md for markdown files.
Some Jekyll plugins confuse Compass by mucking around with the CWD.

This keeps things behaving sanely in such cases.
Grand whitespace cleanup.
Removal of apparently unreferenced, dangling method.

(A search of the code reveals no reference to 'parse_category'...)
An update of rretsiem's pull request, for 2.1.
Merge pull request #1055 from MrJoy/allow_short_markdown_extension_redux

Allow .md for markdown files.
Merge pull request #1059 from MrJoy/compass_rigor

Compass rigor.
Merge pull request #1058 from MrJoy/grand_whitespace_cleanup

Grand whitespace cleanup.
Merge pull request #1056 from MrJoy/dead_code_removal

Removal of apparently unreferenced, dangling method.
Merge pull request #1064 from MrJoy/fb_async_21

Make FB JS load synchronously so it doesn't block page rendering.
Merge pull request #1041 from MrJoy/cleanup_gemfile_lock

Remove cruft from Gemfile.lock since rspec is no longer specified in the Gemfile.
Merge pull request #1050 from MrJoy/update_rack

Bump Rack version to leverage security fixes.
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	Gemfile.lock