Merge pull request #373 from bradbishop/witherspoon

support for building witherspoon images