awseward/capfromscratch — pull request #1 by awseward (2013-08-25 20:43:38+00:00)
Title: Looks ready to merge

Quite a bit of stuff in here, might as well marge it