wp 3.8.3
remove local wp-cli dependency
add roots wrapper override plugin
require acf
Merge branch 'develop'

Conflicts:
	composer.json
	composer.lock