Fabric file, other stuff.  I need to commit more often.
Merge, initial_data fixes.