Merge pull request #7 from kbroman/master

Merged my X chromosome stuff into master branch