bketelsen/skynet — pull request #164 by elimisteve (2012-10-22 13:44:11+00:00)
Title: Fixed merge conflicts

Pulling should be trivial now.