first pass updates
Merge pull request #139 from sinker/2015fellows

first pass updates