make git not fast forward on merge by deafult
remove old unused stuff from i3.base
add script to copy the current config into the repo