ignore swap files
reorganize a bit, fix some routes, use rails 4 style matching, fix tests