HedgeMage/nikola — pull request #1 by HedgeMage (2014-10-14 14:42:03+00:00)
Title: fast forward

Catching fork up to main repo