Use new .rvmrc

Signed-off-by: Lincoln Lee <git@lincoln.hk>
Merge branch 'master' of git://github.com/imathis/octopress
Merge branch 'master' of git://github.com/imathis/octopress
Enable inline PHP syntax highlighting

Pygments has a "startinline" option which is only relevant for the PhpLexer. It allows syntax highlighting without the opening <?php tag. I believe this option is ignored for every other lexer.

Could you either set this to true by default using the proposed change? Or could this be exposed as a setting somewhere in _config.yml? I can't think of a reason someone would not want this enabled.
fixed mobile navigation
fixed video wrapping js
Allowing dashes in code names. Closes #1166
Accepting all non-whitespace characters as language names for Pygments code highlighting
Added support for deploying to github.io
Sinatra now correctly returns code 404 when a page is not found. Closes #1198
Updated RDiscount, added footnotes and other extensions
Removed a couple of buggy filters on RDiscount (for now)
Footnotes styling updates
Recent posts sidebar now correctly observes titlecase settings
Fix codeblock rendering with HAML when there is a filetype defined.
Added !default to $img-border
add https protocol supporting during rake setup_github_pages
Adjusted JsFiddle plugin to detect jsFiddle versions.

Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't
render the desired tab order properly since the regex pattern was
being capturing the /5 as part of the first of the tabs.
Revised the regex for JsFiddle plugin after further testing.
Merge pull request #1267 from vinc/feature-default

Added !default to $img-border