cleanup and updating location of jquery stuff to cdn
cleanup
resolving conflict