updatig the jquery flot library and fixing js error caused by ie4 checks
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
Merge branch 'with_toc' of github.com:asascience-open/maracoos_assets into with_toc
left out a php in there