JY 2013-11-09 testing hackathlon pull

Not much to merge yet. This might make sense to merge at the end of the day...