Merge pull request #48 from coogie/develop

Add support for Twitter Widget and Liquid img tag
Merge pull request #49 from coogie/develop

Make sure users get Master branch
Update Oscailte to support latest Octopress changes
Update README for patch
Merge branch 'jekyll-patch' into develop

Conflicts:
	README.md