jQuery update to fix issue #14
Merge remote-tracking branch 'max/master'

Conflicts:
	public/index.html
	templates/index.jade
Fixing conflict.
Fixing issue in ba-hashchange.
Fixing issue #13.
Updating make to support non-minication via PRETTY env.
Upgrading bootstrap to 2.3.2.
Removing duplication prettify css.
Updating changelog.
Merge pull request #15 from jmervine/master

Addressing open issues. <3 you Josh