Move submodules
Cleanup submodule names
Move additional site files to htdocs
Simplify overwrites and just copy WP submodule into htdocs on deploy
Merge branch 'upgrade-wp-3.8.1'

Conflicts:
	htdocs/wp-content/plugins/authy-two-factor-authentication
	htdocs/wp-content/plugins/jetpack
	htdocs/wp-content/plugins/sendgrid-email-delivery-simplified
	htdocs/wp-content/plugins/wpro