Add settings VC push and pop logic
Merge branch 'master' of https://github.com/pauldare/dare