Merge branch 'vty-5.0'
Merge branch 'master' of github.com:coreyoconnor/yi