Merge pull request #9 from xeno-by/master

updates the future page
Merge pull request #10 from xeno-by/master

oh god maybe it's maruku?
added video link to easy meta
programming talk
Merge pull request #11 from phatak-dev/master

added video link to easy metaprogramming talk
Merge branch 'master' of github.com:scalamacros/scalamacros.github.com
makes the link to the scala.meta video consistent with scalameta.org