Merge branch 'dev'
Merge branch 'dev'
Add imagemagick installation to setup instructions. Hopefully fixes #15
Merge branch 'master' into dev