add ie provisions
safari fixes
fix merge conflicts
fix copyright
bring master up to date with gh-pages
clean up