Update links so that JuliaCon appears.
Merge branch 'master' of github.com:hunterowens/julialang.github.com into gh-pages

* 'master' of github.com:hunterowens/julialang.github.com:
  Update links so that JuliaCon appears.