WIP

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Merge branch 'gh-pages' of github.com:GordonSmith/Conf2013 into gh-pages
WIP

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>