We should _not_ include Mac's .DS_Store in the repo
Do not include Mac .DS_Store in repo
Added Teal letter of collaboration
changed a few words to make it a commitment rather than support, added Lorena, and changed to be dear Slaybaugh.
Merge pull request #68 from rachelslaybaugh/master

changed a few words to make it a commitment rather than support, added L...
separated out summary as needed for proposal submission.
removed summary since it's now its own section. Added NSF prior support section and Titus' information.
Merge pull request #69 from rachelslaybaugh/master

added prior nsf support and separated out summary
teal bios now consistent between formats; changed publications to products.
Mozilla scope of work (and a rename)
Merge branch 'master' of github.com:swcarpentry/iuse2014
Renaming for lower-case and hyphenation consistency
ethans's scope of work.
Merge remote-tracking branch 'upstream/master'
renamed ethan and pphw's workscope for naming consistency.
Merge pull request #70 from rachelslaybaugh/master

fixing teal's bios, adding white and wilsonp scope of work, naming consistency
new dlab letter; encorporating meltem's changes.
added D-lab section to the proposal
incorporated gwilson's feedback on changes - a few word tweaks and update of the example schedule.
Merge pull request #71 from rachelslaybaugh/master

Addressing comments from a UCB NSF expert (former employee)