tidying up the main js file
and the compiled javascript
Merge branch 'develop' of github.com:kojinkai/bd_2013 into develop

Conflicts:
	assets/js/bd_2013.js
	assets/js/bd_2013.min.js
	scripts/main.js