Fixed several issues with minification and updated grunt config