pep8 fixes
images for liquids
removing junk file
fixed repeated text in settings
image support for liquids
removing junk file
merge
fixed overriding default template_context_processors
Merge branch 'master' of https://github.com/bmease/ecig