Some changes to integrate Aim 2 w/ rest of proposal format.

[cgreene]

• Elimination of sections in aims.
• Small changes to structure to accommodate the above.
• Some minor wording changes for a consistent style.