Ease configuration

Make it easier to tweak vagrant vm configurations. Also bring web and desktop configurations a little closer to each other.
Ah, ok :)