feat(Vagrantfile): use "virtio" network devices by default
chore(controller): update psycopg to 2.5.4

http://pythonhosted.org//psycopg2/news.html#what-s-new-in-psycopg-2-5-4
http://pythonhosted.org//psycopg2/news.html#what-s-new-in-psycopg-2-5-3
Merge pull request #2141 from mboersma/update-psycopg

chore(controller): update psycopg to 2.5.4
Typo
Merge pull request #2165 from glomium/patch-1

Typo
Merge pull request #2157 from mboersma/use-vagrant-virtio

feat(Vagrantfile): use "virtio" network devices in virtualbox