Tidy up the template a little bit, using nav filter and block inheritance
Update readme - foundation icons bug