Macs are bad
fix gitignore conflicts
add campaign contribution info
Merge branch 'master' into peter