Improved formatting for long popups
Merge github.com:Zuluru/Zuluru
Roll-up version for recent features and bug fixes