Merging runxmonad changes
Re-adding spiral since it's nifty actually