Fixing budget notes
Merge pull request #18 from crista/master

Updates to OOPSLA and SPLASH pages
typo
Merge pull request #19 from crista/master

Update Conferences.md
Susan's rewording.
Merge pull request #20 from crista/master

Update SPLASH.md
Fixing yaml issue.
fixing conflict
Merge branch 'crista-master'