Merges in upstream changes, addresses the styling 

Anthony,

I just wanted to see what you had done... it looks great!

I made a couple of styling fixes. Should we hide the div with the about and samples on the chart generation and just leave the title? Or perhaps start working on the nav-bar.

I'll take a look at the punch-list.

Matt