added rshaw and cdahlqvist again
Merge pull request #3 from basho/rs_cd

added rshaw and cdahlqvist again