updated badwolf color theme, aliases
completed merge
added more to zshrc