Currently working after merge, pending test with Federico's devise work
Merge problems seemingly fixed?