Remove non_free from git
- Move OSP secert to a new class so that it can
      be changed in the non_free flavour