Merge pull request #142 from ChristinaLK/2015-01-13

Partially updated README on new branch
Revert "Partially updated README on new branch"
Merge pull request #144 from UW-Madison-ACI/revert-142-2015-01-13

Revert "Partially updated README on new branch"
trivial readme change