Moved most aliases and functions out of extra and in to source control. Leave ~/.extra for stuff you want to change without pushing/pulling