andytuba's RES development.  master: all the cool branches merged. other branches: features and bugfixes