Squashed commit of the following:

commit 3f72715ad6c7c21f2e173d42275c578133cd0948
Merge: 89f75d8 7f5f3b0
Author: Brent Meyer <brent.e.meyer@gmail.com>
Date:   Mon Feb 18 18:07:59 2013 -0500

    Merge branch 'master' into bm-bio

commit 89f75d893c6029ed738cfd00855106b1fce52c6e
Author: Brent Meyer <brent.e.meyer@gmail.com>
Date:   Mon Feb 18 17:59:09 2013 -0500

    initial commit
Merge branch 'master' of https://github.com/arjunanand/git-train