Handle vm resizing
Merge branch 'test' of https://github.com/project-fifo/jingles into test

Conflicts:
	app/scripts/controllers/graph.js
	app/styles/main.css