Fixed stuff that got messed up in merging
Merge pull request #203 from coreyjamison/master

Fixed stuff that got messed up in merging