amac441/almanac — pull request #3 by amac441 (2014-05-12 14:12:10+00:00)
Title: Dev2

Hoping that this massive merge works.