Updating with settings from work...

Mostly tab completion, neocompl, and general cleanup