Merge branch 'release/3.3'
Use command-line theme dir, put top-level readme in carrington-core if present
Merge branch 'release/3.4'
Merge tag '3.4' into develop

Revised docs