jverkoey/nimbus — pull request #553 by dmaclach (2014-06-09 21:21:20+00:00)
Title: fix up a number of deprecated/conversion/shadow warnings

This should have the merge conflict resolved.