moved files
Merge branch 'master' of https://github.com/mystickahuna/nlpgis

Conflicts:
	.gitignore