Cleaning up and minor additions.
Adding gitignore.
Merge pull request #17 from Adron/develop

Develop