Updating iterm preferences
Merging in github things