Hammering my stuff into Joe's format a bit. #fingerscrossed for successful merge.
Trying to get this merge thing closer....
Merge branch 'master' of github.com:schneidan/felix into dan
Tweaks after master-merge, /edit works now.