Touch up of montage and simple templates
Merge branch 'master' of https://github.com/mthpower/timeline-blog

Conflicts:
	timeline/static/css/base.css
Smaller transparent icons
Merge pull request #23 from mthpower/smaller_icons

Smaller icons