adding linux env stuff
sane gitignore
Merge branch 'master' into HEAD

Conflicts:
	.gitignore_global
shelling...
gitting there...