swapped aronud blog and current
Merge branch 'master' into gh-pages