added FIXME and improved some map-grep-foo
Merge branch 'develop' of github.com:blastmaster/BeerPlusPlus into develop