Foodcritic based cleanup, fixes for Vagrant deployments.