karlstolley/535 — pull request #48 by matthewheston (2012-11-28 02:44:01+00:00)
Title: Dev

Mostly formatting stuff to fit in with standards. Also filling in a couple of my TODO's.