merge Lisa into Development

Kevin, 

Could you to merge these since you have more experience dealing with the conflicts? I'm afraid I will screw something up. I'll try to figure out the merging when I have some time to play with it more. 

~ lisa