Generated master for commit 3b4267c
Author: Anthony Scopatz <scopatz@gmail.com>

    moved stuff around