Merge!

Hey Jeff!  Merging all the changes I've done for the site.

Two things:

1. I use ngBoilerplate (as explained in the readme) and that ended up including all their git history too.  Didn't want to prune it in case I screwed up.
2. For now I've included the assets in this push.  It's a couple mb of .jpgs for the site.  I realize this isn't best practice in the future, I just wanted to make sure that you got all the assets necessary for the site.