bringing mac up to speed
Merge branch 'master' of https://github.com/alexjgriffith/peaks