merge master to gh-pages

merge in a jquery flippy fix