Merge branch 'master' of git://github.com/vgeorge/infoamazonia-maps into vgeorge-master

Conflicts:
	.gitignore