Clearer peakflops doc.
Fix mistake in pkg2.jl

Probably introduced by a merge earlier (might help #3695)
Merge github.com:JuliaLang/julia