merge in pentadactyl plugins and colors from work mac mini