update jquery and hopefully update codekit config file to always output combined lib and main js files into right filename and location
pull upstream changes down
pull rebase from upstream branch