updating tags, categories; added new post
Merge branch 'master' of github.com:jontsai/jontsai.github.com

Conflicts:
	_posts/2012-10-04-brogrammer.md
	_posts/2012-10-04-ubuntud-out.md