new marker icons again
hardly a merge really
Merge pull request #5 from boylea/master

New icons and code cleanout