Update plugins to match production
Update submodules
Merge branch 'master' of github.com:wpaustralia/wpaustralia