nav now checks last width before resizing, to stop an iphone bug (resizing on scroll)
Merge branch 'master' into gh-pages