merging experimental
Fixed README.md typo
Merge pull request #46 from tdcook/master

Fixed a typo in README.md
ignore ds_store
Merge branch 'master' of github.com:NateW/obtvse
A simple rake task to migrate from wordpress
Adding wordpress migration functionality with rake args
require showdown
Merge pull request #60 from jackdempsey/require_showdown

require showdown
Merge pull request #55 from javaguirre/master

Rake task to migrate from Wordpress
replaced tabs in posts_controller w/spaces for consistency

posts_controller.b seemed to be the only file in the app
that was using tabs so I replaced them with the rails standard
of two spaces for consistency with the rest of the app.
Merge pull request #61 from masukomi/whitespace

replaced tabs in posts_controller w/spaces for consistency
removed dependency on javascript library for embedding gists, using simple ajax and custom css to style gists
Merge pull request #63 from mindscratch/upstream

removed dependency on javascript library for embedding gists
Fix issues from previous merge
add excerpts functionality using <!--more--> tag
stop excerpt view being shown during preview
change button text and give it an arrow
removed instruction to cp config/config.example.yml

This file no longer exists.
Removed the line in the README.md. The following line
correctly instructs the user to edit config/config.yml
Merge pull request #68 from masukomi/natew_readme

removed instruction to cp config/config.example.yml