added SETTINGS_FILE
updated completion and zshrc
updated aliases
Saving my changes
more specific changes for dev04
update to aliases and git completion
Cleaned up aliases
Unaliasing no longer displays errors for new sessions
Plugin additions
updated plugins
Merging local changes