Added resumator alias
Add vm aliases back to resumator
Added resumator aliases to dotfiles
Resuatmor dev profile for iterm
Updating path vars
Merge branch 'master' into resumator-settings
Merge branch 'master' into resumator-settings

Conflicts:
	com.googlecode.iterm2.plist
Fixed conflict