Add colors to include_code warning/error output
Colorized error for haml.rb
Colorized error for pagination.rb
Colorized error for sitemap_generator.rb
Make Octopress only load its configs once per process.
Updating deps.  Notable changes:

chunky_png:
* Fixed an error n 4-bit resampling code.

fast-stemmer:
* Fixed to work with compilers other than gcc.

fssm:
* Remove deprecation message.
* Fix to work with JRuby.

haml:
* Fix for line numbers reported from exceptions in nested blocks.

kramdown:
* BREAKING CHANGE: Code language is now specified via .language-CODELANG instead of lang='CODELANG'
  * See this page for explanation: http://kramdown.rubyforge.org/news.html
Merge pull request #1115 from imathis/colorize

Colorize Terminal Errors/Warnings
Merge pull request #1176 from MrJoy/update_dependencies_take2

Updating deps.  Notable changes:
Updates to javascript

- Changed require.yml config from dependencies to globals (more obvious what it means)
- Updated js_asset_manager to work with new require.yml
- Fixed a few bugs in octopress.js related to mobile nave and flash movies.
Merge pull request #1174 from MrJoy/config_singleton_take3

Make Octopress only load its configs once per process.
Use rspec for testing
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	Gemfile.lock