New version using Display Suite and Node Displays
Merge branch 'master' of https://github.com/branej/test_site1