update gitignore to include ac-comphist
change magit-status key to M-p due to conflict