Merge pull request #97 from bjacobel/master

Longform article template
Merge remote-tracking branch 'orient/master'