Merge branch 'master' of https://github.com/georgekick/misc

Conflicts:
	R/ptsKml.R
Merge branch 'master' of https://github.com/georgekick/misc

Conflicts:
	R/ptsKml.R