Clean up unused vars and tasks, fix vagrant

Depending on @al3x' response to #18, we might want to change this back to sovereign. Just keep that in mind.