Requirements Merged

Merged changed requirements from the Requirements Overhaul draft. Fixed
some formatting.