rename muplugins to muplugin
Merge branch 'master' of git://github.com/KarelOK/heroku-wp into KarelOK-master
Update lock file hash
Merge branch 'KarelOK-master'
Better HHVM selection, props @dzuelke
Upgrade WP to 4.0
Merge branch 'master' into prod

Conflicts:
	composer.lock
Better hr style
Better table styles
Fix responsive widths
Better gist embeds
Fix whitespace
Version bump CSS
More table style fixes
Update README.md

The name of the folder by default is heroku-wp :)
Merge pull request #13 from valentinvieriu/patch-1

Update README.md
Update core and plugins to latest
Merge branch 'master' into prod

Conflicts:
	composer.json
	composer.lock