Added media section to example_config.
More work on abstractions
Added a .gitignore

Also removed an unintended commit of the .settings directory
Merge remote-tracking branch 'origin/1.3' into 1.3