Merge branch 'render_org_files' into 'master'

Render org files

Fixes #1215

Gemfile

@@ -85,6 +85,7 @@ gem "seed-fu"
 # Markdown to HTML
 gem "redcarpet",     "~> 2.2.2"
 gem "github-markup"
+gem "org-ruby" # For rendering .org files
 
 # Diffs
 gem 'diffy', '~> 3.0.3'

Gemfile.lock

@@ -319,6 +319,8 @@ GEM
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
+    org-ruby (0.9.6)
+      rubypants (>= 0.2.0)
     orm_adapter (0.5.0)
     pg (0.15.1)
     phantomjs (1.9.2.0)
@@ -427,6 +429,7 @@ GEM
       rspec-mocks (~> 2.14.0)
     ruby-progressbar (1.2.0)
     rubyntlm (0.1.1)
+    rubypants (0.2.0)
     rugged (0.19.0)
     safe_yaml (0.9.7)
     sanitize (2.1.0)
@@ -625,6 +628,7 @@ DEPENDENCIES
   omniauth-github
   omniauth-google-oauth2
   omniauth-twitter
+  org-ruby
   pg
   poltergeist (~> 1.4.1)
   protected_attributes