Basic fixes, new source model, etc. Let the merge conflicts begin!
Merge branch 'master' of github.com:magento-hackathon/Firegento_FlexCms