Config Updates
Conflicts
Merge branch 'master' of https://github.com/tbadaczewski/lantern

Conflicts:
	config.xml
	partials/main.html