Squashed commit of the following:

commit a627f35c489fe450bef46187dda816448654ba50
Author: roglew <rglew56@gmail.com>
Date:   Mon Dec 9 15:54:38 2013 -0500

    Fixed compiler warnings