Merging in cards update
Fixing some cards issues
More backbone work
Basic repo markup