Update nav with new Twitter Bootstrap markup.
Merge pull request #79 from stevepiercy/master

Update nav with new Twitter Bootstrap markup. Also include overlooked changes to user from Rick