Merge upstream/master
Add helper method to log in to UU
Add aliases for editing UU config files