Upgrade wordpress to 3.6.1
Update documentation for updating the core wordpress version.
Don't include the PhpStorm into the repository.
Refactor using the configuration files.

Separation between wp-config.php and wp-config-local.php. The local version contains the environment specific variables, while the regular wp-config contains the settings for this git based wordpress setup.
Ensure the right config file is loaded.
Exclude mac system file .DS_Store from the repo.
Don't allow uploaded files in the repo.
Hint developers to directly unpack new plugins on the filesystem instead of ftp.
Adding the .htaccess in the gitignore means that it won't be deployed.
Update Wordpress core to the 3.7 tag; #2
Explain the new security features in WP 3.7 for configuration of the environment; #2
Temp solution for overwriting .htaccess files; #1

Just rename the htaccess snippet from this specific setup. Wordpress can add another rewrite rule, but it's written to the end of the file. This means it will never be applied, due to the L modifier in the boilerplate part.
Update documentation with regards to updating WP; fixes #3
Implemented must-use plugin in order to always rewrite a proper .htaccess file. Fixes #1
Update Wordpress to 3.7.1
Ensure compatibility with WP-CLI. It needs an HTTP_HOST in order to work.
Merge remote-tracking branch 'upstream/master' into woocommerce-boilerplate

Conflicts:
	.gitignore
	README.md
	wordpress
	wp-config.php