Merge pull request #13 from uncanny-piranha/develop

Merge develop into master 10/23/14
cleaning up code
fixing deployment
Merge pull request #14 from darkstar21/develop

Cleaned up code, added comments