Moves 2013 stuff around, to prep for 2013
Merge pull request #34 from bdone/2013

Moves 2013 stuff around, to prep for 2013