Some quick work
Merge branch 'master' of github.com:Diamond/sagadev-site