Updates Copyright to 2014
Updates Copyright to 2014 in more files
Merge pull request #1394 from gem/copy2014

Updates Copyright to 2014
Reformatted a docstring
Merge pull request #1384 from gem/pickle-unpickle

Manual pickling/unpickling
Merged from master