Remove functions from other branch
Add support for display option

Ref #418
Implement configuration merging

Fixes #418

TODO:
- Specific tests.
- Better handling from powerline-lint side (it should no longer check separate
  files for themes and colorschemes).
- Better handling for marked values in powerline-lint when using merging.
Special-case .copy() method

Still more fixes to add for powerline-lint