aws and git diff
merge
port for foreman
ignore netrwhist
merge ignore and bashrc