Train 2013.06.19 hotfix - FirefoxOS primary support

This hotfix includes Shane's fixes to make primaries work on firefoxos.

/cc @shane-tomlinson @jrgm