further cleanup.  maybe done screwing around now?
Merge pull request #3 from greeze/infrastructure

further cleanup.  maybe done screwing around now?