clean up
Merge branch 'master' of https://github.com/col-panic/col-panic.github.io

Conflicts:
	repositories/redsalt-dependencies/artifacts.jar
	repositories/redsalt-dependencies/content.jar
	repositories/redsalt-dependencies/plugins/com.thoughtworks.xstream_1.4.1.jar
	repositories/redsalt-dependencies/plugins/commons-logging_1.1.0.jar
	repositories/redsalt-dependencies/plugins/jaxen_1.1.1.jar
	repositories/redsalt-dependencies/plugins/log4j_1.2.12.jar
	repositories/redsalt-dependencies/plugins/net.sf.opencsv_2.1.0.jar
	repositories/redsalt-dependencies/plugins/org.freemarker_2.3.15.jar
	repositories/redsalt-dependencies/plugins/xerces.Impl_2.6.2.jar
	repositories/redsalt-dependencies/plugins/xmlpull_1.1.3.1.jar
	repositories/redsalt-dependencies/plugins/xpp3.min_1.1.0.4c.jar