Fixed jquery conflict issue

Fixed jquery include issue.
I had tried to manually include jquery, as it was not working... but it turns out that the whole javascript asset pippeline was not being included... all appears to be working now