08/26/2013 Plarzoid

More fixes
08/27/2013 Plarzoid

Numerous fixes due to odd issues during deployment testing
08/27/2013 Plarzoid

Fixed #10.
Merge pull request #16 from Nova-Open-LLC/master

Merge master into dev