Update .travis.yml
Merge pull request #6 from robertiagar/gh-pages

Updated travis.yml
Merge pull request #7 from robertiagar/layout

Merge pull request #6 from robertiagar/gh-pages
Updated
Merge branch 'gh-pages' into tags-and-categories

Conflicts:
	.travis.yml
	categories.html
	tags.html