Some changes
Random changes
Merge branch 'master' of https://github.com/donreamey/NireLang

Conflicts:
	src/NireSrc/Nire.cs
	modified:   Nire.cs