Committed from CI (build number - 13548741) [ci skip]
Merge branch 'master' of github.com:waltzio/waltz
Merge pull request #131 from waltzio/develop

Merging in for beta1
Tell travis to use the master branch, now that develop is default
Travis: remove the git repo from the current work directory
Travis: head back to the root before cloneing
Travis: I'M A DUNCE
Travis: Now that we've changed to the root directory, we need to reference the old build directory
Travis: I wish I could run these without committing...
Travis: OK, now I'm just testing stuff
Travis: FINALLY I understand what's going on
Committed from CI (build number - 15373829) [ci skip]
removes debug option
Merge branch 'develop' with updated version to 0.2.1.1
Merge branch 'develop' and bump to 0.2.1.2`
Merge branch 'develop' and pushed version 0.2.1.3
Merge branch 'develop'
Merge branch 'develop'
moves waltz back to top corner
turns on debug etc