Add additional attributes for use downstream
Pin cron due to breakage yesterday
Issue with upstream was fixed last night, pinning upwards again and going back to upstream
Merge pull request #42 from martinb3/master

Add additional attributes for use downstream
remerge with base