Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589

minor tweak to _typography.scss to have pp, code, and tt extend style that exists
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'github-repositories-plugin' of https://github.com/pilif/octopress into pilif-github-repositories-plugin
Merge branch 'pilif-github-repositories-plugin'
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master

Conflicts:
	plugins/category_generator.rb
Merge branch 'post_filters_plugin' of https://github.com/tedkulp/octopress into post_filters
Merge branch 'post_filters'
Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of github.com:imathis/octopress into compass
Merge pull request #180 from victor/patch-1

Allow capitalization after a period.
Merge branch 'master' of github.com:imathis/octopress
Merge branch 'master' of github.com:imathis/octopress
Merge pull request #201 from mikl/category-feeds

Adds per-category Atom feeds.
Merge pull request #295 from jbrains/master

Capitalize word after '!' and '?'.
Merge pull request #270 from omo/missing-default-variables

Add missing default qualifiers to some sass variables.
Merge pull request #271 from simensen/ConfigureFontFamilyForSubtitle

Make font-family for subtitle configurable.
Merge pull request #225 from imathis/post_names

Add more flexibility to :new_page task
Merge branch 'master' of github.com:imathis/octopress
Merge pull request #376 from robertkowalski/clrf

Fix CRLF, closes #374
Merge pull request #602 from zan5hin/powrc

Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...