tidying up layout / adding minified javascript
Merge branch 'master' into gh-pages

Conflicts:
	os.css