Brought over styles from yeoman site
Fixed merge conflicts
Cleaned up extraneous files