expansion additions & rename

* US-X1 -> X1
* US-X2 -> X2
* US-X3 -> X3

+ CA (Canadian Expansion)
+ CAH-Holiday-2012
+ CAH-PAX-East-2013
+ CAH-PAX-Prime-2013