Looks like I'll have to do this at least one more time.
Version 6.99992
Personal changes.. last time i hope.
Version 6.99993
Merge http://git.tukui.org/Elv/elvui