added loading of custom functions
Merge branch 'master' of https://github.com/edjames/mac-dots