Umm, merging differences I forgot about?
Merge branch 'master' of github.com:lairdm/islandplot

Conflicts:
	circularsample.js
fixed