Process images on display, not on upload. Should close #103
Merge branch 'magickly'

* magickly:
  Process images on display, not on upload. Should close #103