Update license tags
Remove phpoption

Being considered for Mvc, but not yet used, and Mvc is not included in XMF 1.0