Added tag 2.0 for changeset 0bb1df93c2ea
Bumped to 2.1 in preparation for next release.
Remove unreachable code
Remove commented code
Remove _marker_names (unused)
Encapsulate marker evaluation functionality in a class.
Remove compatibility functions for platform information.