Initial commit with all existing stuff up to end of August 2013
Merge remote-tracking branch 'Swarm/master'