Format code and use same method as VVV

Except for the :extra flag because VVV uses an array there, while that triggers error on my machine with Vagrant 1.2.2.