move initialization into initialization method
Merge branch 'master' of github.com:dchester/flight-cms