Merge pull request #1 from cScarlson/master

Pull This!!! Got Manifest wokinging with factory!!!