fixed docstrings
updated copywrite
fixed conflict
fixed conflict
Bug #317: Completed quoting for parameters of some CMake commands

A Wiki article pointed out that whitespace will only be preserved for parameters
in CMake commands if passed strings will be appropriately quoted or escaped.
http://cmake.org/Wiki/CMake/Language_Syntax#CMake_splits_arguments_unless_you_use_quotation_marks_or_escapes.

Quoting was added so that more places should also handle file names correctly
which contain space characters eventually.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Merge pull request #321 from erelson/staging

Fixes to mcnp.SurfSrc class Thanks @erelson
Merge pull request #308 from scopatz/doc-fox

pong!
Merge remote-tracking branch 'origin' into surfsrcexample

Conflicts:
	pyne/mcnp.py