Misc changes

* Move rbenv around
* Add more emacs configuration
* Change PATH a bit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bash_profile
	emacs
	zshrc