Merge branch 'master' of github.com:cylc/cylc
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Basic jinja2 testing added.
Basic database tests.
Merge remote branch 'upstream/master' into expand-battery-2
Added further jinja2 tests.
Merge remote branch 'upstream/master' into expand-battery-2
Add time_parser.py testing to battery.
Test dummy mode.
Correct documentation entry for dummy mode.
Add a wait for registration to work check to test head.
Merge pull request #696 from arjclark/expand-battery-2

cylc test-battery: expand battery 2