Merge pull request #1 from mcelaney/master

Some basic setup stuff
changed README file