moved nav float to scss, minor updates
Merge branch 'gh-pages'