improvements, additions, restructure

also, ansible-vagrant broken with vagrant 1.1 release. that's kind of
important.