Merged from Bongrain

- Had small changes while working on bgfs website, merging them
  back to the main GIT repository now
Retrieved file from older revision
Added watch target to Makefile
Updated gitignore to ignore compiled CSS files