added gem rack-timeout
Merge branch 'master' into heroku
updated root index page to include mini nav for basic areas
syncd with master