Begin comment redesign.
Merge branch 'master' into comment-redesign
Comment redesign for readability and consistency. Closes #47.