Made a change to detect the OS when setting the path for ImageMagick
Merge branch 'refs/heads/development' into Rails