rearranged and changed wording
Merge branch 'master' of git://gitorious.org/snowdrift/snowdrift
image size fix, minor wording change