Added legacy-option to toggle legacy and experimental implementations of CSP.
Formatting.
Merge pull request #1 from auchenberg/legacy

Added legacy-option to toggle legacy and experimental implementations of CSP.