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
My Favorite Plugins
Merge branch 'master' into prod

Conflicts:
	composer.json
	composer.lock