Removed complaining merge line in .gitconfig
A few tweaks
Fix git's editor preference
Added proper bc alias