* delete build dir entirely and recreate it as part of the build
* partial implementation of using a tmpdir if one exists
* failed to actually commit the new build.xml
* don't bother with create_build_dir for now
* script to save off build dir from tmp, committing in case we try that approach again later
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 1168_jenkins_slow
* add timestamper jenkins module to puppet config for jenkins and to build templates
* first attempt at cleanup of unit test syntax:
  * upgrade to qunit-1.15
  * use test() { stop(); ... } instead of asyncTest(), for standardization
  * pass "assert" argument to all tests, and use assert verification functions, to help avoid bleeding
  * move some uses of ajaxSetup in favor of stop()/start(), where my testing showed this could be done
* up qunit timeout from 60s to 180s
Merge pull request #1179 from cgolubi1/1168_jenkins_slow

minor tweaks related to jenkins slowness
* add a test to make sure jQuery commands aren't left running at the ends of tests, fix some non-terminating Game tests, and mock all showXPage tests
* typo
* add expect statements for tests where we're using mocking
Merge pull request #1180 from cgolubi1/1104_qunit_failures

Let's do this thing!
Resolving merge conflicts
Trying to convince git that I'm resolving conflicts
OK, that didn't work
Losing all of my changes for conflict resolution
Re-instating those changes, hoping for the best
Trying this again