Cleanup
Ignoooooore
Merge branch 'master' of github.com:schneidan/felix into dan
Tweaks after master-merge, /edit works now.