Merge pull request #2 from lawinslow/master

Added NML and Version functions and fixed up a bunch of small errors and default NML changes
Merge remote-tracking branch 'upstream/master'