Merge branch 'plotting' into 'master'
# Conflicts: # nifty/config/nifty_config.py
nifty/plotting/__init__.py
0 → 100644
nifty/plotting/plottable.py
0 → 100644
nifty/plotting/plotting.py
0 → 100644
# Conflicts: # nifty/config/nifty_config.py