Merge pull request #580 from sg00dwin/nav-docs

Merged by openshift-bot
Updated Vagrantfile to reflect config processing changes as of Vagrant 1.7.1
Reintroduced Vagrant version sensitivity
Update bindata to match an updated dependency
Merge pull request #1 from jwforres/fix_bindata

Update bindata to match an updated dependency
Merge pull request #578 from nhr/vagrantfile_update

Merged by openshift-bot
Incorrect path argument for Golint
Merge pull request #575 from jhadvig/golint_fix

Merged by openshift-bot
Update nav with labels