Add option for circle marker

This pull request maintains the default behavior of using an icon based marker, but allows for a fairly simple switch to a circle marker.