pulling in to migration station
Merge pull request #3 from mjsteichen/nick-branch

pulling in to migration station