if defined rails
Merge branch 'master' of github.com:oreillymedia/atlas_assets