merge cleanup
Merge branch '20130703---After-a-long-time' of https://github.com/OpenInstitute/OpenDuka into 20130703---After-a-long-time