Added some CVS helpers
Merge branch 'master' into optus

* master:
  Added some CVS helpers
Added more ignores
Merge branch 'master' into optus

* master:
  Added more ignores
More optus ignores