Update rails notes etc
Merge branch 'mac'

Add mac rails notes onto master branch