bashrc: add more aliases
bashrc: remove "--preserve-merges" from "rebase -i"

It's a git bug to use the two together.

See http://stackoverflow.com/questions/27627527/git-rebase-interactive-is-silently-dropping-commits-while-attempting-to-reor
and the BUGS section under http://git-scm.com/docs/git-rebase