Adding various bits and pieces
Adding some of Chris Hunts config - staying away from key bindings