taking out test comment. not needed.
checking in some changes to email and stuff. bla
Merge branch 'master' into gh-pages