Merge branch 'master' of /Users/dsmart/Desktop/Local/camp-o-matic with conflicts.