Consistent status names and custom markers

Closes #110
Closes #97

<!---
@huboard:{"order":136.0,"milestone_order":135,"custom_state":""}
-->