removed old syntax for user_image_tag
new wiki url
remove macosx fixles
Merge branch 'master' into staging