From: noah morrison <noah@morrison.ph>
Date: Mon, 17 Nov 2014 19:30:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'standalones'
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=34acaed27d08c2faedb4339b5629914b27355a1f;p=chevron.git

Merge remote-tracking branch 'standalones'

from dmorrison42/standalones

Much simpler logic and removes some code that I didn't understand
---

34acaed27d08c2faedb4339b5629914b27355a1f