Fix bad merge from prior commit
Add keyremap4macbook module and settings