Updated screenshot code per Brian
Merge branch 'named-screenshots'