3505 Add .now to flash message to make it less sticky.
3418 Change scope, add test
3505 fixing chapter controller and adding tests
3505 better tests
Merge pull request #1754 from scottsds/issue_3418_v2

3418 Change scope, add test
Merge pull request #1753 from scottsds/issue_3505_fix

3505 Add .now to flash message to make it less sticky.
3505 v3: Remove .now and hope for the best
Merge pull request #1755 from scottsds/issue_3505_fix

3505 v3: Remove .now and hope for the best