Merge branch 'master' of github.com:joelkuiper/clinicico

* 'master' of github.com:joelkuiper/clinicico:
  Don't create simlink during initialise
Merge branch 'master' of github.com:joelkuiper/clinicico

* 'master' of github.com:joelkuiper/clinicico: