Updating dclark/0.3.4_dev with all the updates that sgiavasis has