Couple of changes to zshrc

- new modules
- rvm related chamges
- mc alias
Fix SSL errors
Aliased curl to newer version from homebrew
Fix merge conflict