Title fixes
Merge branch 'dev-master' into dhagen-new
Last minute stuff.
OH NOOOOOgit add .git add .
Merge branch 'dhagen-new' into dev-master