Fix for issue #398

- Fixed an issue where label total wasn't getting correctly set on annotator content load
- Fixed handling of '0' (unlimited) value for annotator max labels setting
- Some code cleanup
Fix for issue #399