More Clean Up
Merge branch 'dev'

Conflicts:
	pelicanconf.pyc
new post
Merge branch 'master' of https://github.com/albush/albush.com