Enable rbenv on macs if installed
Set HTML indentation to 2 spaces
Merge remote-tracking branch 'refs/remotes/origin/master'