Deprecated MomentJS methods

MomentJS has deprecated pre-2.0 syntax for add/subtract methods. See
https://github.com/moment/moment/pull/1763.
fixed forceSix test
Merge branch 'cwackerman-master'