merge in work for Spring '14 demo

merging in a term's worth of changes.