Added new marker shapes, refactored code some
Merge branch 'master' of github.com:ctessum/carto