Working tests and correction of structure
travis
Merge branch 'v1' of github.com:genesis/wordpress into v1

* 'v1' of github.com:genesis/wordpress:
  Working tests and correction of structure

Conflicts:
	bin/mock