removed junk and fixed routes
Merge branch 'master' of https://github.com/onword/onword