Fixes Travis issues, improves modularity and fixes non-default key binding issues