Changed Rbenv settings, seems like my if condition was not working properly
Merge branch 'master' of github.com:isa/environments

* 'master' of github.com:isa/environments:
  Update osx/.profile
  Update osx/zsh/zshrc
  Update osx/zsh/zshrc
  Update osx/.profile
Added puppet