Don't display comments link for post excerpts on index page when comments for that post are set to false.
updated to latest version of Sass, fixed deprecation warnings
Fixed “3rd party plugins” wiki page link

Signed-off-by: Brandon Mathis <brandon@imathis.com>
Octopress filters are now limited to html producing templating languages, Fixes #536
Merge pull request #499 from lukekarrys/patch-1

Don't display comments link for post excerpts on index page when comments for that post are set to false
Updated Gemfile
updated plugins to work with latest version of Liquid
Do not strip trailing slash of canonical URLs.

Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't.  Some services (e.g. http://b.hatena.ne.jp/)
are confused with that behavior.

We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Merge pull request #592 from omasanori/fix-rel-canonical

Do not strip trailing slash of canonical URLs.
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.

Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.

The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
Merge pull request #602 from zan5hin/powrc

Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
Merge remote-tracking branch 'octopress/master'

* octopress/master:
  Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.
  Do not strip trailing slash of canonical URLs.
  updated plugins to work with latest version of Liquid
  Updated Gemfile
  Octopress filters are now limited to html producing templating languages, Fixes #536
  Fixed “3rd party plugins” wiki page link
  updated to latest version of Sass, fixed deprecation warnings
  Don't display comments link for post excerpts on index page when comments for that post are set to false.

Conflicts:
	Gemfile
	Gemfile.lock
update octopress
2012-07-07-jisan-valley-rock-festival-2012
add shutlle bus info
update shuttle bus info
add yuruyuruhanguk link
2012-07-24 lldecade-lunch-spots
2013-03-14 ec2-ssh