Tidied up the rx code a little, added scope.$apply calls
Merge branch 'master' of https://github.com/TheGrandUser/Hexcrawl.git