lots of random stuff -- still lots to do before grunt works properly
yet another stab at Issue #17