Development

merge various commits from 2014 NeXus Code Camp and NIAC Meeting