merged in diopt and directory split.
merged in diopt and directory split.

alliance-genome/agr,nathandunn/agr,nathandunn/agr,alliance-genome/agr,alliance-genome/agr,alliance-genome/agr_prototype,nathandunn/agr,alliance-genome/agr_prototype,nathandunn/agr,alliance-genome/agr