tweaks controllers and adds rails roady diagrams
fixes date in articles
Merge branch 'master' of github.com:ambertunnell/worldview
Fixed merge conflict