Squashed commit of the following:

commit e4c54c73794ee98c5abdb15f009e68ccbbe0379b
Author: Avinash Baliga <fifoforlifo@gmail.com>
Date:   Thu Mar 28 00:45:44 2013 -0500

    Fixed test2 build to fully work in new location.

commit ea4d32a90aa735a9ff546040cee9d0499b991d80
Author: Avinash Baliga <fifoforlifo@gmail.com>
Date:   Thu Mar 28 00:30:07 2013 -0500

    Moved test code into test2 subdir.

    This is just a bunch of file renames, with minimal
    modifications.  It's not yet functional.