fixing rebase issues and updating version number
im a retard who cant save commits
checking
Update BadAss.
trying to get cmdline aroma working