Fixed merge conflicts
Added super hacky support stuff
Merge branch 'master' of https://github.com/MattAttack/bh-seattle-2013

Conflicts:
	markmywords/markmywords/templates/go.html
Merge branch 'master' of https://github.com/MattAttack/bh-seattle-2013