Merge branch 'hotfix/documentation'
exclude Gemfile from _site
Merge pull request #39 from jimjh/patch-1

exclude Gemfile from _site
Update site.url and exclude Gemfile.lock
change site url
updated code-highlighting-post
Update/new Post from Jekyll for Android app
fixed config conflicts
removed JB/setup
Merge branch 'master' of https://github.com/railsdev/railsdev.github.com
updated _config.yml