Created new theme and tidied a few things up
Merge branch 'master' into new-theme
Updated copy
Merge branch 'master' into new-theme
Commented out freelance stuff for now