updated Bootstrap and jQuery

jQuery only upgraded to 1.11.0 because 2.x not compatible with older
versions of ie. Also did some cleaning up for base template.
Merge pull request #1 from thecristen/master

updated Bootstrap and jQuery
Merge branch 'master' into dev
changes deprecated simplejson to json