Cleaned up routes
merging..
Merge branch 'master' of https://github.com/dioms/vlm