Adds 'converser.io' to list of sites.
Merge pull request #163 from donovanh/patch-2

Adds 'converser.io' to list of sites.
Added middleman-rouge syntax highlighting
Merge pull request #164 from Linuus/master

Added middleman-rouge extension
add 'carl.hoyer.ca' to Blogs Using Middleman
Merge pull request #166 from choyer/master

Add 'carl.hoyer.ca' to Blogs Using Middleman
Replace `source :rubygems` with url for rubygems.org

Bundler (>= 1.3.0) says:
```
The source :rubygems is deprecated because HTTP requests are insecure.
Please change your source to 'https://rubygems.org' if possible, or
'http://rubygems.org' if not.
```
Modify filetype

- 755 -> 644
Document json as data store
Highlight code
Merge pull request #171 from tricknotes/highlight-code

Highlight code
Merge pull request #169 from tricknotes/suppress-bundler-warning

Replace `source :rubygems` with url for rubygems.org
Merge pull request #168 from tricknotes/document-json-as-data

Document json as data store
Merge pull request #170 from tricknotes/644

Modify filetype
Fixes grammar
Removes trailing whitespace
Merge pull request #172 from strathmeyer/master

Grammar & Whitespace fixes
Merge remote-tracking branch 'upstream/master' into ja

Conflicts:
	source/advanced/custom.html.markdown
	source/advanced/local-data.html.markdown
	source/advanced/localization.html.markdown
	source/blogging.html.markdown
	source/pretty-urls.html.markdown