model upgrades
Merge branch 'master' of http://github.com/dkraczkowski/alchemy